Merge from Linus' tree
commitb6ec995a21a9428aef620b5adf46d047a18d88b8
authorPaul Mackerras <paulus@samba.org>
Wed, 12 Oct 2005 04:43:32 +0000 (12 14:43 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 12 Oct 2005 04:43:32 +0000 (12 14:43 +1000)
tree6719121e6605cbca524b687f47336b9bbf3b8d41
parent3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a
parentda64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89
Merge from Linus' tree
22 files changed:
arch/powerpc/platforms/pseries/pci.c
arch/ppc/platforms/4xx/ebony.c
arch/ppc/platforms/chestnut.c
arch/ppc/platforms/chrp_setup.c
arch/ppc/platforms/gemini_setup.c
arch/ppc/platforms/pmac_cpufreq.c
arch/ppc/platforms/pmac_feature.c
arch/ppc/platforms/pmac_setup.c
arch/ppc/platforms/pmac_time.c
arch/ppc/platforms/pplus.c
arch/ppc/platforms/radstone_ppc7d.c
arch/ppc/platforms/sandpoint.c
arch/ppc/syslib/open_pic.c
arch/ppc/syslib/open_pic2.c
arch/ppc/syslib/ppc4xx_setup.c
arch/ppc64/kernel/bpa_iommu.c
arch/ppc64/kernel/kprobes.c
arch/ppc64/kernel/pci_direct_iommu.c
arch/ppc64/kernel/pci_iommu.c
drivers/macintosh/smu.c
include/asm-ppc/io.h
include/asm-ppc64/iommu.h