Merge branch 'linux-2.6' into powerpc-next
authorPaul Mackerras <paulus@samba.org>
Fri, 16 May 2008 13:13:42 +0000 (23:13 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 16 May 2008 13:13:42 +0000 (23:13 +1000)
1  2 
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/mm/init_64.c
drivers/net/Kconfig
include/asm-powerpc/mmu-hash64.h

Simple merge
Simple merge
Simple merge
Simple merge