]> 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>
Mon, 10 Sep 2012 00:28:13 +0000 (10:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 00:28:13 +0000 (10:28 +1000)
commitc767c5ec7913bcad898ef8dc202f2805db05bcda
tree8933928946bde6eb79c1a679767e97c982683a2a
parent0a84eb77d35fbb28d42222fe9c2cb47879fac7bf
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