diff options
| author | Linus Torvalds <[email protected]> | 2014-06-06 17:24:07 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-06-06 17:24:07 +0000 |
| commit | 9e47aaef0bd3a50a43626fa6b19e1f964ac173d6 (patch) | |
| tree | e5ee8bd64aaf3bb3342426e842504d659bb976c0 /tools/perf/scripts/python/check-perf-trace.py | |
| parent | Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze i... (diff) | |
| download | kernel-9e47aaef0bd3a50a43626fa6b19e1f964ac173d6.tar.gz kernel-9e47aaef0bd3a50a43626fa6b19e1f964ac173d6.zip | |
Fix ARM merge mistake in mvebu board file
Russell King points out that my ARM merge (commit eb3d3ec567e8) was
broken wrt the arch/arm/mach-mvebu/board-v7.c file, leaving in a stale
l2x0_of_init() call (it's now handled by the DT description).
Which is kind of embarrassing, since I knew about it as it wasn't the
only file that had similar merge issues. At least I got the other ones
right.
Reported-by: Russell King <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/check-perf-trace.py')
0 files changed, 0 insertions, 0 deletions