diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 20:59:36 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 20:59:36 +0200 |
| commit | c16b4c1af326dae7d3ef251e4f13dea7c2051485 (patch) | |
| tree | 70e2415cbe23f5764345bc4dee0e59328ecd2f3a /kernel/trace/trace_functions_graph.c | |
| parent | a06347d0cac281546954c4223073ecd9bbf719c5 (diff) | |
| parent | f1cefa855f6e7d10dd49724ede771b8f0c2a90e7 (diff) | |
Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/fixes-non-critical
From Shawn Guo <shawn.guo@linaro.org>:
* 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs/tx28: fix odd include
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
0 files changed, 0 insertions, 0 deletions