Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 14 May 2012 00:19:22 +0000 (10:19 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 14 May 2012 00:19:22 +0000 (10:19 +1000)
We want the irq fixes from the "merge" branch.

1  2 
arch/powerpc/kernel/entry_64.S

Simple merge