]> 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>
Sun, 7 Oct 2012 23:00:45 +0000 (10:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:00:45 +0000 (10:00 +1100)
commit393d14d7486b2b846d5934da198245a5a511f7ae
tree2ca1bf62683b6184abc6827d75846d19cbfff7e2
parent2b731ff5249cc49a5ec2af9636df5ba58103bebd
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