Merge commit 'jwb/jwb-merge' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 28 Jan 2009 06:15:34 +0000 (17:15 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 28 Jan 2009 06:15:34 +0000 (17:15 +1100)
commit6469c92e0a4879e57bccbbacb2b724672a4fa8fb
tree65b3377bdea03342f64f5cd414d61824ff2cf354
parent0411648e445d850ded24aba98f1774c417bf5658
parent0b21bcd5b52779be0c18a6c201ae8f060d3b2bf2
Merge commit 'jwb/jwb-merge' into merge

Manual merge of:
arch/powerpc/configs/44x/warp_defconfig
arch/powerpc/configs/44x/sam440ep_defconfig
arch/powerpc/configs/44x/warp_defconfig
arch/powerpc/configs/ppc40x_defconfig
arch/powerpc/configs/ppc44x_defconfig