tree 77d13fcd48fd998393abb825ec36e2b732684a73
parent 585583d95c5660973bc0cf64add517b040acd8a4
parent 85082fd7cbe3173198aac0eb5e85ab1edcc6352c
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1216100691 +1000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1216100691 +1000

Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build

Manual fixup of:

	arch/powerpc/Kconfig