Merge commit 'jwb/jwb-next'
commit930074b6b9c4895d20cdadba5aff97907e28728d
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Jul 2008 01:54:57 +0000 (15 11:54 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 15 Jul 2008 01:54:57 +0000 (15 11:54 +1000)
tree3725eca121188f2e9c3b8bb4d4b8ba35e92640c7
parent3fd44736db9a5bf33e4a216b9cd43c9cfd57c459
parent2bf3016f89344d4cd8b2c96bbec2b642a2bde413
Merge commit 'jwb/jwb-next'
arch/powerpc/Kconfig
arch/powerpc/boot/Makefile