Merge branch 'merge'
commit57cad8084e0837e0f2c97da789ec9b3f36809be9
authorPaul Mackerras <paulus@samba.org>
Tue, 1 Aug 2006 00:37:25 +0000 (1 10:37 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 1 Aug 2006 00:37:25 +0000 (1 10:37 +1000)
treee9c790afb4286f78cb08d9664f58baa7e876fe55
parentcb18bd40030c879cd93fef02fd579f74dbab473d
parent49b1e3ea19b1c95c2f012b8331ffb3b169e4c042
Merge branch 'merge'
31 files changed:
arch/powerpc/kernel/ibmebus.c
arch/powerpc/kernel/pci_32.c
arch/powerpc/kernel/pci_64.c
arch/powerpc/kernel/prom_parse.c
arch/powerpc/kernel/setup-common.c
arch/powerpc/kernel/sysfs.c
arch/powerpc/platforms/cell/interrupt.c
arch/powerpc/platforms/cell/spider-pic.c
arch/powerpc/platforms/cell/spu_base.c
arch/powerpc/platforms/maple/setup.c
arch/powerpc/platforms/powermac/backlight.c
arch/powerpc/platforms/powermac/cpufreq_64.c
arch/powerpc/platforms/powermac/pci.c
arch/powerpc/platforms/pseries/ras.c
arch/powerpc/platforms/pseries/setup.c
arch/powerpc/platforms/pseries/xics.c
drivers/char/hvsi.c
drivers/i2c/busses/i2c-powermac.c
drivers/macintosh/macio_asic.c
drivers/macintosh/smu.c
drivers/macintosh/via-pmu.c
drivers/net/spider_net.c
drivers/scsi/ibmvscsi/rpa_vscsi.c
drivers/scsi/mac53c94.c
drivers/scsi/mesh.c
drivers/video/S3triofb.c
drivers/video/aty/radeon_base.c
drivers/video/aty/radeon_pm.c
drivers/video/offb.c
drivers/video/riva/fbdev.c
include/asm-powerpc/system.h