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)
commit8b6ee04067310a6397476f05f06e52dabd8b0bb6
tree022a153b777a9e38f49d46e4fb8f1e6747d4a5f4
parentb48d441a8ab8a89bd32a3a981a05b8a26905dfc7
parent7c0482e3d055e5de056d3c693b821e39205b99ae
Merge branch 'merge' into next

We want the irq fixes from the "merge" branch.
arch/powerpc/kernel/entry_64.S