Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 9 May 2012 00:57:57 +0000 (10:57 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 9 May 2012 00:57:57 +0000 (10:57 +1000)
1  2 
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/exceptions-64s.S

Simple merge
Simple merge