Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 10 Jul 2012 09:16:43 +0000 (19:16 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 10 Jul 2012 09:16:43 +0000 (19:16 +1000)
commit50bba07d6a16ce4a3b4f6abb44bfd3645c046ef6
treec76f080377dd611857fa33f38a2b8a2af4576f8b
parenta8b91e43afd736fcebb0836359e5ddaeae45b2ab
parent50fb31cfed9218b439360caf7c0399b00042da15
Merge branch 'merge' into next

We want to bring in the latest IRQ fixes
arch/powerpc/mm/numa.c
arch/powerpc/platforms/pseries/processor_idle.c