]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-perf/for-next/perf'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:27:50 +0000 (09:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:27:50 +0000 (09:27 +1100)
commita81bd7ca2f5ae1f590acd2aacbd11ce520ab7551
treebf7719fc044840352f374d7905b616e5310c28e5
parentfdfc09e5742c18596d89a6488fd4618bc453aeb9
parentb90c4b95f5cee1ce804e227fa4308f7deb370a3b
Merge remote-tracking branch 'arm-perf/for-next/perf'

Conflicts:
arch/arm/kernel/hw_breakpoint.c
arch/arm/mach-bcmring/arch.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-tegra/devices.c
arch/arm/mach-ux500/cpu-db8500.c