]> 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, 26 Sep 2012 00:05:09 +0000 (10:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 00:05:09 +0000 (10:05 +1000)
commit8106359877f30967bc09fdd984fdbea6a5e32377
tree9bd23c200272c5acdf2ca8a4fa3d25be51d2b492
parent0096904236f2946ce674cbda5833cd04ab5923c9
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