]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 Nov 2012 06:02:46 +0000 (17:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 Nov 2012 06:02:46 +0000 (17:02 +1100)
commit20289fa9878c1bb7ea8ac9865fe513cf04af487e
tree490cc5fa6b2357f1921ac39d65b6d4a3b9deff5f
parentea3a855778c76d552faafabd6764c10de3a9edee
parentcedddd812a79a4fda3885a15711aee3de78c4a24
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/entry_64.S
drivers/of/base.c
include/linux/of.h
tools/perf/perf.h