]> err.no Git - linux-2.6/commitdiff
Merge commit 'origin/HEAD' into test-merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 14 Jul 2008 04:29:49 +0000 (14:29 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 14 Jul 2008 04:29:49 +0000 (14:29 +1000)
Manual fixup of include/asm-powerpc/pgtable-ppc64.h

1  2 
arch/powerpc/boot/Makefile
drivers/net/ibm_newemac/core.c
include/asm-powerpc/pgtable-ppc64.h

Simple merge
Simple merge
Simple merge