]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-perf/for-next/perf'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 23:50:46 +0000 (10:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 23:50:46 +0000 (10:50 +1100)
commit756337c010acf5e42479fb39af94c5d7a314f2d7
tree4e4a99942b6889b187204a8072e88557f51a068c
parenta6e4e1e2c89e6c3f817501c551f8d3dee53dd3bf
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