Merge commit 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 31 May 2010 00:01:50 +0000 (10:01 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 31 May 2010 00:01:50 +0000 (10:01 +1000)
commitecca1a34befbb13fc23d9a2cc0d6b725c7727fb2
tree6539480b50258f30af799a6ab38529d7b2d7e538
parent3d00d4ff11686895925f46265f4a78dc78196c2e
parent48936a08b85518c22a9467a8eaac35d43af54ab4
Merge commit 'kumar/next' into next

Conflicts:
arch/powerpc/sysdev/fsl_msi.c
arch/powerpc/Kconfig
arch/powerpc/kernel/traps.c
arch/powerpc/sysdev/fsl_msi.c