]> 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>
Thu, 6 Sep 2012 01:10:21 +0000 (11:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 01:10:21 +0000 (11:10 +1000)
commit7063ec1997aa350a2b5bac25fc813decb70e6ca0
tree20a2d38885d016f8e693cc4158221256011b72b1
parentbed395d0b772c504ecb2a33db3320b8dce71b77e
parentb90c4b95f5cee1ce804e227fa4308f7deb370a3b
Merge remote-tracking branch 'arm-perf/for-next/perf'

Conflicts:
arch/arm/kernel/hw_breakpoint.c
MAINTAINERS
arch/arm/Kconfig
arch/arm/kernel/Makefile
arch/arm/plat-samsung/devs.c