summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-stmp378x
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 22:09:22 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 22:09:22 +0000
commitbc85e585c6d0fab4bde12d60964b2f25802c3163 (patch)
tree80f5fe916e3458d0676e595e3433a0313e7ba72b /arch/arm/mach-stmp378x
parent186f93ea1f274f4cde4a356401c1786c818ff881 (diff)
parent796d12959ad374cae8eb77faaf4243455a305433 (diff)
Merge branch 'perf' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-stmp378x')
0 files changed, 0 insertions, 0 deletions