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)
commitfcff474ea5cb17ff015aa40e92ed86fede41f1e2
treea99c0e14daaf31cb078812fb2fbc6abadfcd738f
parent541b2755c2ef7dd2242ac606c115daa11e43ef69
parentf26a3988917913b3d11b2bd741601a2c64ab9204
Merge branch 'linux-2.6' into powerpc-next
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/mm/init_64.c
drivers/net/Kconfig
include/asm-powerpc/mmu-hash64.h