summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ep93xx
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 23:09:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 23:09:22 +0100
commitbc85e585c6d0fab4bde12d60964b2f25802c3163 (patch)
tree80f5fe916e3458d0676e595e3433a0313e7ba72b /arch/arm/mach-ep93xx
parentMerge branch 'tmpreg' into devel (diff)
parentARM: 5903/1: arm/perfevents: add support for ARMv7 (diff)
downloadlinux-bc85e585c6d0fab4bde12d60964b2f25802c3163.tar.xz
linux-bc85e585c6d0fab4bde12d60964b2f25802c3163.zip
Merge branch 'perf' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-ep93xx')
0 files changed, 0 insertions, 0 deletions