Merge ../linux-2.6
authorPaul Mackerras <paulus@samba.org>
Fri, 17 Mar 2006 01:01:19 +0000 (12:01 +1100)
committerPaul Mackerras <paulus@samba.org>
Fri, 17 Mar 2006 01:01:19 +0000 (12:01 +1100)
1  2 
arch/powerpc/Kconfig
arch/powerpc/kernel/ppc_ksyms.c
arch/powerpc/kernel/rtas_pci.c
arch/powerpc/kernel/time.c
arch/powerpc/platforms/powermac/feature.c
arch/powerpc/platforms/powermac/setup.c

Simple merge
Simple merge
Simple merge
Simple merge