]> 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, 3 Oct 2012 01:07:46 +0000 (11:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:07:46 +0000 (11:07 +1000)
commit1b22de6100c450615cda4c7c6844a4e046aee1c5
tree653900257b985732f96292ebc12e0c701097a1d4
parent8bebe81cbfb379b7d790f2f480ee1a67c6c7a9b5
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-tegra/devices.c
arch/arm/mach-ux500/cpu-db8500.c