Merge branch 'linux-2.6'

diff --cc arch/powerpc/Kconfig
index 5f80f0b828f2726e1e820c8d36f4bea1d2c1b264,d6abe495c6b083a228a6507ac03505c5f0f2a122..aeb53096acf7ac602458bc23f4d3f3fe1be5dfad
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -491,7 -484,7 +491,8 @@@ config PPC_MAPL
        select PPC_970_NAP
        select PPC_NATIVE
        select PPC_RTAS
 +      select MMIO_NVRAM
+       select ATA_NONSTANDARD if ATA
        default n
        help
            This option enables support for the Maple 970FX Evaluation Board.
@@@ -539,17 -532,10 +540,20 @@@ config PPC_PS
        help
          This option enables support for the Sony PS3 game console
          and other platforms using the PS3 hypervisor.
+         Support for this platform is not yet complete, so
+         enabling this will not result in a bootable kernel on a
+         PS3 system.
  
 +config PPC_CELLEB
 +      bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
 +      depends on PPC_MULTIPLATFORM && PPC64
 +      select PPC_CELL
 +      select PPC_OF_PLATFORM_PCI
 +      select HAS_TXX9_SERIAL
 +      select PPC_UDBG_BEAT
 +      select USB_OHCI_BIG_ENDIAN_MMIO
 +      select USB_EHCI_BIG_ENDIAN_MMIO
 +
  config PPC_NATIVE
        bool
        depends on PPC_MULTIPLATFORM

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