Merge commit 'origin/HEAD' into test-merge
commit11c2d8174ed3dc4f1971564732689b4a39129702
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 14 Jul 2008 04:29:49 +0000 (14 14:29 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 14 Jul 2008 04:29:49 +0000 (14 14:29 +1000)
treeac00daa548ea8ac24ae7a5c8062312e335ab9858
parentcde274c0c789404df8ece3f9e7d6506caf0127e2
parentbce7f793daec3e65ec5c5705d2457b81fe7b5725
Merge commit 'origin/HEAD' into test-merge

Manual fixup of include/asm-powerpc/pgtable-ppc64.h
arch/powerpc/boot/Makefile
drivers/net/ibm_newemac/core.c
include/asm-powerpc/pgtable-ppc64.h