Merge branch 'linux-2.6'

diff --cc arch/powerpc/Kconfig
index 5ada5b45cbb1e3102b305898aaf169cfe242ffb9,8de5f9ff4ade1e8b36793ddb2f464c6d0113dc06..67668fdb0292ccc3003e5e63fa7daee9924b048a
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -117,9 -117,19 +117,22 @@@ config GENERIC_BU
        default y
        depends on BUG
  
 +config SYS_SUPPORTS_APM_EMULATION
 +      bool
 +
+ #
+ # Powerpc uses the slab allocator to manage its ptes and the
+ # page structs of ptes are used for splitting the page table
+ # lock for configurations supporting more than SPLIT_PTLOCK_CPUS.
+ #
+ # In that special configuration the page structs of slabs are modified.
+ # This setting disables the selection of SLUB as a slab allocator.
+ #
+ config ARCH_USES_SLAB_PAGE_STRUCT
+       bool
+       default y
+       depends on SPLIT_PTLOCK_CPUS <= NR_CPUS
+ 
  config DEFAULT_UIMAGE
        bool
        help

diff --cc arch/powerpc/kernel/Makefile
index 4dc73b8c25bafda15e105e14cf940a76f599b190,aa693d0f151ad26f50a14d48f6cf240318d21e22..94c703a95013f07654f4c5ec25807da3efadd0e6
--- 1/arch/powerpc/kernel/Makefile
--- 2/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@@ -36,9 -36,8 +36,9 @@@ obj-$(CONFIG_GENERIC_TBSYNC)  += smp-tbs
  obj-$(CONFIG_CRASH_DUMP)      += crash_dump.o
  obj-$(CONFIG_6xx)             += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
  obj-$(CONFIG_TAU)             += tau_6xx.o
- obj-$(CONFIG_SOFTWARE_SUSPEND)        += swsusp.o
++obj-$(CONFIG_SOFTWARE_SUSPEND)        += swsusp.o suspend.o
  obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o
 -obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o
 +obj64-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_64.o swsusp_asm64.o
  obj32-$(CONFIG_MODULES)               += module_32.o
  
  ifeq ($(CONFIG_PPC_MERGE),y)

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

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

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

diff --cc arch/ppc/syslib/ppc4xx_sgdma.c
index 93349e48bfbf3eeaee50ce32546f606f745a6855,5dadca3e0d61646415f7fd17dce2d99ce1a4bd8b..c4b369b50f9ce243fc46ffab47d5e0077d56ed93
--- 1/arch/ppc/syslib/ppc4xx_sgdma.c
--- 2/arch/ppc/syslib/ppc4xx_sgdma.c
+++ b/arch/ppc/syslib/ppc4xx_sgdma.c
@@@ -23,8 -23,6 +23,7 @@@
  #include <linux/mm.h>
  #include <linux/init.h>
  #include <linux/module.h>
- #include <linux/pci.h>
 +#include <linux/dma-mapping.h>
  
  #include <asm/system.h>
  #include <asm/io.h>

diff --cc drivers/ide/pci/pdc202xx_new.c
Simple merge

diff --cc drivers/infiniband/hw/ehca/ehca_main.c
Simple merge

diff --cc drivers/pci/hotplug/rpaphp_core.c
Simple merge

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

diff --cc drivers/serial/of_serial.c
Simple merge

diff --cc drivers/usb/host/ehci-ps3.c
Simple merge

diff --cc drivers/usb/host/ohci-ps3.c
Simple merge

diff --cc drivers/video/ps3fb.c
index a9ca4986645c1bfa6e1a3d87a562a29b4fe955d7,07d1979bc23e1707138286736c77fac62749d09b..9756a728b74f3e2dbb58d5ca0709b3b298266c06
--- 1/drivers/video/ps3fb.c
--- 2/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@@ -885,10 -898,10 +898,10 @@@ static int ps3fb_vsync_settings(struct 
        }
  
        ps3fb.dev = dev;
 -      error = ps3_alloc_irq(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet,
 -                            &ps3fb.irq_no);
 +      error = ps3_irq_plug_setup(PS3_BINDING_CPU_ANY, dinfo->irq.irq_outlet,
 +                                 &ps3fb.irq_no);
        if (error) {
-               printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __FUNCTION__,
+               printk(KERN_ERR "%s: ps3_alloc_irq failed %d\n", __func__,
                       error);
                return error;
        }
@@@ -896,9 -909,9 +909,9 @@@
        error = request_irq(ps3fb.irq_no, ps3fb_vsync_interrupt, IRQF_DISABLED,
                            "ps3fb vsync", ps3fb.dev);
        if (error) {
-               printk(KERN_ERR "%s: request_irq failed %d\n", __FUNCTION__,
+               printk(KERN_ERR "%s: request_irq failed %d\n", __func__,
                       error);
 -              ps3_free_irq(ps3fb.irq_no);
 +              ps3_irq_plug_destroy(ps3fb.irq_no);
                return error;
        }
  
@@@ -1083,9 -1107,14 +1107,14 @@@ void ps3fb_cleanup(void
  {
        int status;
  
+       if (ps3fb.task) {
+               struct task_struct *task = ps3fb.task;
+               ps3fb.task = NULL;
+               kthread_stop(task);
+       }
        if (ps3fb.irq_no) {
                free_irq(ps3fb.irq_no, ps3fb.dev);
 -              ps3_free_irq(ps3fb.irq_no);
 +              ps3_irq_plug_destroy(ps3fb.irq_no);
        }
        iounmap((u8 __iomem *)ps3fb.dinfo);
  

diff --cc include/linux/suspend.h
Simple merge

diff --cc kernel/power/Kconfig
index 5001c652028c35a8f2aa1972377161ebc2b8ca05,877721708fa4135e4340311e4640c535ecb83038..495b7d4dd3304d650bb5c540b29a868eb0fce88a
--- 1/kernel/power/Kconfig
--- 2/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@@ -78,10 -78,12 +78,12 @@@ config PM_SYSFS_DEPRECATE
          are likely to be bus or driver specific.
  
  config SOFTWARE_SUSPEND
-       bool "Software Suspend"
+       bool "Software Suspend (Hibernation)"
 -      depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP))
 +      depends on PM && SWAP && (((X86 || PPC64_SWSUSP) && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP))
        ---help---
-         Enable the suspend to disk (STD) functionality.
+         Enable the suspend to disk (STD) functionality, which is usually
+         called "hibernation" in user interfaces.  STD checkpoints the
+         system and powers it off; and restores that checkpoint on reboot.
  
          You can suspend your machine with 'echo disk > /sys/power/state'.
          Alternatively, you can use the additional userland tools available