]> 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>
Fri, 7 Sep 2012 00:57:04 +0000 (10:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 00:57:04 +0000 (10:57 +1000)
commit5f885e7eef64d2cfc493f90a9ce2891df31e9ad1
tree8a7dfa641451627a25283a1d670dd48568c299be
parent1a66f6e877acbf72af9d26bac8734bfdc075294b
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