]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Dec 2012 22:37:22 +0000 (09:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Dec 2012 22:37:24 +0000 (09:37 +1100)
commit8d1cddf14e9142f5c07a6bebdf1ddd12241153b1
tree08cb8c1ced15d386e7b0c27b9f1396368eec83f6
parent94e9ee54954b58bcdbdc8aea176dd2ba164a488f
parent1a9bd45412665e73c72612b6f744378d860e02a8
Merge remote-tracking branch 'powerpc/next'

Conflicts:
tools/perf/perf.h
lib/Kconfig.debug