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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (49 commits)
  [POWERPC] Add zImage.iseries to arch/powerpc/boot/.gitignore
  [POWERPC] bootwrapper: fix build error on virtex405-head.S
  [POWERPC] 4xx: Fix 460GT support to not enable FPU
  [POWERPC] 4xx: Add NOR FLASH entries to Canyonlands and Glacier dts
  [POWERPC] Xilinx: of_serial support for Xilinx uart 16550.
  [POWERPC] Xilinx: boot support for Xilinx uart 16550.
  [POWERPC] celleb: Add support for PCI Express
  [POWERPC] celleb: Move miscellaneous files for Beat
  [POWERPC] celleb: Move a file for SPU on Beat
  [POWERPC] celleb: Move files for Beat mmu and iommu
  [POWERPC] celleb: Move files for Beat hvcall interfaces
  [POWERPC] celleb: Move the SCC related code for celleb
  [POWERPC] celleb: Move the files for celleb base support
  [POWERPC] celleb: Consolidate io-workarounds code
  [POWERPC] cell: Generalize io-workarounds code
  [POWERPC] Add CONFIG_PPC_PSERIES_DEBUG to enable debugging for platforms/pseries
  [POWERPC] Convert from DBG() to pr_debug() in platforms/pseries/
  [POWERPC] Register udbg console early on pseries LPAR
  [POWERPC] Mark udbg console as CON_ANYTIME, ie. callable early in boot
  [POWERPC] Set udbg_console index to 0
  ...

1 files changed, 25 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 2edec00c12c..a942f385249 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1106,6 +1106,12 @@ M:	kernel@wantstofly.org
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 
+CIRRUS LOGIC CS4270 SOUND DRIVER
+P:      Timur Tabi
+M:      timur@freescale.com
+L:      alsa-devel@alsa-project.org
+S:      Supported
+
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
 P:      Cirrus Logic Corporation (kernel 2.2 driver)
 M:      Cirrus Logic Corporation, Thomas Woller <twoller@crystal.cirrus.com>
@@ -1628,6 +1634,12 @@ L:	linuxppc-dev@ozlabs.org
 L:      netdev@vger.kernel.org
 S:      Maintained
 
+FREESCALE QUICC ENGINE LIBRARY
+P:      Timur Tabi
+M:      timur@freescale.com
+L:      linuxppc-dev@ozlabs.org
+S:      Supported
+
 FREESCALE HIGHSPEED USB DEVICE DRIVER
 P:      Li Yang
 M:      leoli@freescale.com
@@ -1642,6 +1654,19 @@ L:	netdev@vger.kernel.org
 L:      linuxppc-dev@ozlabs.org
 S:      Maintained
 
+FREESCALE QUICC ENGINE UCC UART DRIVER
+P:      Timur Tabi
+M:      timur@freescale.com
+L:      linuxppc-dev@ozlabs.org
+S:      Supported
+
+FREESCALE SOC SOUND DRIVERS
+P:      Timur Tabi
+M:      timur@freescale.com
+L:      alsa-devel@alsa-project.org
+L:      linuxppc-dev@ozlabs.org
+S:      Supported
+
 FILE LOCKING (flock() and fcntl()/lockf())
 P:      Matthew Wilcox
 M:      matthew@wil.cx