OSDN Git Service

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)
commitea4e89afedc7fc64078076eacbcffaaa742baf0d
tree1e4a14dd1ada2eff8d1cb4d76bf9e337e079845e
parent43671cc96e58458b2711f1e97ff24a4c0e7cd1ac
parenta3512b2dd57cb653bb33645ca9c934436e547e3c
Merge branch 'merge' into next
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/exceptions-64s.S