Merge branch 'linux-2.6' into powerpc-next

diff --cc arch/powerpc/mm/hash_utils_64.c
Simple merge

diff --cc arch/powerpc/mm/init_64.c
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc include/asm-powerpc/mmu-hash64.h
Simple merge