Merge branch 'linux-2.6'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/boot/Makefile
Simple merge

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

diff --cc arch/powerpc/platforms/pasemi/Makefile
index 2cd2a4f,e636daa..8f52d75
--- 1/arch/powerpc/platforms/pasemi/Makefile
--- 2/arch/powerpc/platforms/pasemi/Makefile
+++ b/arch/powerpc/platforms/pasemi/Makefile
@@@ -1,3 -1,4 +1,3 @@@
- obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o
+ obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o
  obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o
 -obj-$(CONFIG_ELECTRA_IDE) += electra_ide.o
  obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o

diff --cc arch/powerpc/platforms/pasemi/pasemi.h
Simple merge

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

diff --cc arch/powerpc/sysdev/ipic.c
Simple merge

diff --cc arch/powerpc/sysdev/mpic.c
Simple merge

diff --cc arch/powerpc/sysdev/mv64x60_dev.c
Simple merge

diff --cc arch/ppc/8260_io/enet.c
Simple merge

diff --cc arch/ppc/syslib/open_pic.c
Simple merge

diff --cc drivers/ata/Kconfig
Simple merge

diff --cc drivers/ata/Makefile
Simple merge

diff --cc drivers/ata/pata_mpc52xx.c
Simple merge

diff --cc drivers/char/hw_random/pasemi-rng.c
Simple merge

diff --cc drivers/macintosh/adb.c
index 5ae28f0,b7adde4..7ce0ea6
--- 1/drivers/macintosh/adb.c
--- 2/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@@ -854,8 -875,5 +854,8 @@@ adbdev_init(void
        adb_dev_class = class_create(THIS_MODULE, "adb");
        if (IS_ERR(adb_dev_class))
                return;
-       class_device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb");
+       device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), "adb");
 +
 +      platform_device_register(&adb_pfdev);
 +      platform_driver_probe(&adb_pfdrv, adb_dummy_probe);
  }

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

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

diff --cc drivers/macintosh/via-pmu.c
index 82ec12e,ac420b1..ebec663
--- 1/drivers/macintosh/via-pmu.c
--- 2/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@@ -2479,10 -2793,10 +2479,10 @@@ static int pmu_sys_resume(struct sys_de
        return 0;
  }
  
 -#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 +#endif /* CONFIG_SUSPEND && CONFIG_PPC32 */
  
  static struct sysdev_class pmu_sysclass = {
-       set_kset_name("pmu"),
+       .name = "pmu",
  };
  
  static struct sys_device device_pmu = {

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/ibm_newemac/core.c
Simple merge

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

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