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)
We want to bring in the latest IRQ fixes

1  2 
arch/powerpc/mm/numa.c
arch/powerpc/platforms/pseries/processor_idle.c

Simple merge