]> 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>
Thu, 13 Sep 2012 01:16:18 +0000 (11:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 01:16:18 +0000 (11:16 +1000)
commit73684e94db382edebde702c638fc98528edc68ae
treec8d5225d7fe8d383f1ee4de9ebaaa0c76099a465
parent154bdea6ac0fc3393f9b366bf9b6f622751d0783
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