Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Update defconfigs for desktop/server systems
  [POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec
  [POWERPC] Update arch/powerpc/boot/.gitignore
  [POWERPC] Remove generated files on make clean
  [POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword
  [POWERPC] Update Cell MAINTAINERS entry, add spufs entry
  lmb: Fix compile warning

12 files changed, 675 insertions, 555 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a0291616a35f..dc94fc5cb25b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -982,13 +982,6 @@ L:	bonding-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/bonding/
 S:      Supported
 
-BROADBAND PROCESSOR ARCHITECTURE
-P:      Arnd Bergmann
-M:      arnd@arndb.de
-L:      linuxppc-dev@ozlabs.org
-W:      http://www.penguinppc.org/ppc64/
-S:      Supported
-
 BROADCOM B44 10/100 ETHERNET DRIVER
 P:      Gary Zambrano
 M:      zambrano@broadcom.com
@@ -1052,6 +1045,14 @@ L:	linux-kernel@vger.kernel.org
 L:      discuss@x86-64.org
 S:      Maintained
 
+CELL BROADBAND ENGINE ARCHITECTURE
+P:      Arnd Bergmann
+M:      arnd@arndb.de
+L:      linuxppc-dev@ozlabs.org
+L:      cbe-oss-dev@ozlabs.org
+W:      http://www.ibm.com/developerworks/power/cell/
+S:      Supported
+
 CFAG12864B LCD DRIVER
 P:      Miguel Ojeda Sandonis
 M:      maxextreme@gmail.com
@@ -3776,6 +3777,14 @@ M:	dbrownell@users.sourceforge.net
 L:      spi-devel-general@lists.sourceforge.net
 S:      Maintained
 
+SPU FILE SYSTEM
+P:      Jeremy Kerr
+M:      jk@ozlabs.org
+L:      linuxppc-dev@ozlabs.org
+L:      cbe-oss-dev@ozlabs.org
+W:      http://www.ibm.com/developerworks/power/cell/
+S:      Supported
+
 STABLE BRANCH:
 P:      Greg Kroah-Hartman
 M:      greg@kroah.com
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 2347294ff35b..2f50acd11a60 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -20,21 +20,19 @@ kernel-vmlinux.strip.gz
 mktree
 uImage
 cuImage.*
+dtbImage.*
 treeImage.*
 zImage
+zImage.initrd
 zImage.bin.*
 zImage.chrp
 zImage.coff
-zImage.coff.lds
-zImage.ep*
+zImage.holly
 zImage.iseries
 zImage.*lds
 zImage.miboot
 zImage.pmac
 zImage.pseries
-zImage.redboot*
-zImage.sandpoint
-zImage.vmode
 zconf.h
 zlib.h
 zutil.h
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 7822d25c9d31..f5e0b2a5af57 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -99,7 +99,7 @@ $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds: $(obj)/%: $(srct
         @cp $< $@
 
 clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) \
-                empty.c zImage zImage.coff.lds zImage.ps3.lds zImage.lds
+                empty.c zImage.coff.lds zImage.ps3.lds zImage.lds
 
 quiet_cmd_bootcc = BOOTCC  $@
       cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
@@ -339,7 +339,9 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
         sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<
 
 # anything not in $(targets)
-clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \
+clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
+        zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
+        zImage.iseries zImage.miboot zImage.pmac zImage.pseries \
         otheros.bld *.dtb
 
 # clean up files cached by wrapper
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index 1e7802cc31ae..fea592574004 100644
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -271,27 +271,35 @@
                 dma@82a8 {
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        compatible = "fsl,mpc8349-dma";
+                        compatible = "fsl,mpc8377-dma", "fsl,elo-dma";
                         reg = <0x82a8 4>;
                         ranges = <0 0x8100 0x1a8>;
                         interrupt-parent = <&ipic>;
                         interrupts = <0x47 8>;
                         cell-index = <0>;
                         dma-channel@0 {
-                                compatible = "fsl,mpc8349-dma-channel";
+                                compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <0x47 8>;
                         };
                         dma-channel@80 {
-                                compatible = "fsl,mpc8349-dma-channel";
+                                compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <0x47 8>;
                         };
                         dma-channel@100 {
-                                compatible = "fsl,mpc8349-dma-channel";
+                                compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <0x47 8>;
                         };
                         dma-channel@180 {
-                                compatible = "fsl,mpc8349-dma-channel";
+                                compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <0x47 8>;
                         };
                 };
 
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index d7fd298bd234..05360d4ef1b1 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25-rc6
+# Linux kernel version: 2.6.26-rc3