diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-22 00:22:12 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-22 00:22:12 -0800 |
| commit | b2555b877bf9faf7045ae362ca051590e79167cf (patch) | |
| tree | a4dfbc40f93be0c2668bbe51541c8a26f16f44dd /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | [media] coda: Fix build due to iram.h rename (diff) | |
| download | linux-b2555b877bf9faf7045ae362ca051590e79167cf.tar.gz linux-b2555b877bf9faf7045ae362ca051590e79167cf.zip | |
Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
From Sascha Hauer:
ARM i.MX fixes for -rc.
This contains a single compilation fix for the CODA driver.
* tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6:
[media] coda: Fix build due to iram.h rename
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions