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)
commit23dd64011285010ac291f7dddf6e287bdb43a0ad
tree0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f
parent516450179454de9e689e0a53ed8f34b896e8651c
parent485ff09990416c75ae9593ddc71619939ab9dd51
Merge ../linux-2.6
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