Merge branch 'merge'

diff --cc arch/powerpc/kernel/ibmebus.c
Simple merge

diff --cc arch/powerpc/kernel/pci_32.c
Simple merge

diff --cc arch/powerpc/kernel/pci_64.c
Simple merge

diff --cc arch/powerpc/kernel/prom_parse.c
Simple merge

diff --cc arch/powerpc/kernel/setup-common.c
Simple merge

diff --cc arch/powerpc/kernel/sysfs.c
Simple merge

diff --cc arch/powerpc/platforms/cell/interrupt.c
Simple merge

diff --cc arch/powerpc/platforms/cell/spider-pic.c
Simple merge

diff --cc arch/powerpc/platforms/cell/spu_base.c
Simple merge

diff --cc arch/powerpc/platforms/maple/setup.c
Simple merge

diff --cc arch/powerpc/platforms/powermac/backlight.c
Simple merge

diff --cc arch/powerpc/platforms/powermac/cpufreq_64.c
Simple merge

diff --cc arch/powerpc/platforms/powermac/pci.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/ras.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/setup.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/xics.c
Simple merge

diff --cc drivers/char/hvsi.c
Simple merge

diff --cc drivers/i2c/busses/i2c-powermac.c
Simple merge

diff --cc drivers/macintosh/macio_asic.c
Simple merge

diff --cc drivers/macintosh/smu.c
index 6f35860,00ef468..090e40f
--- 1/drivers/macintosh/smu.c
--- 2/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@@ -483,9 -490,10 +490,10 @@@ int __init smu_init (void
                printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");
                goto fail;
        }
-       data = get_property(np, "reg", NULL);
 -      data = (u32 *)get_property(smu->db_node, "reg", NULL);
++      data = get_property(smu->db_node, "reg", NULL);
        if (data == NULL) {
-               of_node_put(np);
+               of_node_put(smu->db_node);
+               smu->db_node = NULL;
                printk(KERN_ERR "SMU: Can't find doorbell GPIO address !\n");
                goto fail;
        }
@@@ -500,15 -508,13 +508,13 @@@
  
        /* Now look for the smu-interrupt GPIO */
        do {
-               np = of_find_node_by_name(NULL, "smu-interrupt");
-               if (np == NULL)
+               smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt");
+               if (smu->msg_node == NULL)
                        break;
-               data = get_property(np, "reg", NULL);
 -              data = (u32 *)get_property(smu->msg_node, "reg", NULL);
++              data = get_property(smu->msg_node, "reg", NULL);
                if (data == NULL) {
-                       of_node_put(np);
+                       of_node_put(smu->msg_node);
+                       smu->msg_node = NULL;
                        break;
                }
                smu->msg = *data;

diff --cc drivers/macintosh/via-pmu.c
Simple merge

diff --cc drivers/net/spider_net.c
Simple merge

diff --cc drivers/scsi/ibmvscsi/rpa_vscsi.c
Simple merge

diff --cc drivers/scsi/mac53c94.c
Simple merge

diff --cc drivers/scsi/mesh.c
Simple merge

diff --cc drivers/video/S3triofb.c
Simple merge

diff --cc drivers/video/aty/radeon_base.c
Simple merge

diff --cc drivers/video/aty/radeon_pm.c
Simple merge

diff --cc drivers/video/offb.c
Simple merge

diff --cc drivers/video/riva/fbdev.c
Simple merge

diff --cc include/asm-powerpc/system.h
Simple merge