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
  ...

diff --combined MAINTAINERS
index 2edec00c12c0cc6fcf3a221f0810825a8eeb04ff,bb58b3beae7c536f7e32ed213bf01d6a42bf0e7c..a942f385249901d21e679a5d77478bd3e4f49174
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1106,6 -1106,12 +1106,12 @@@ M:    kernel@wantstofly.or
  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 +1634,12 @@@ L:    linuxppc-dev@ozlabs.or
  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 +1654,19 @@@ L:    netdev@vger.kernel.or
  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
@@@ -2558,10 -2583,12 +2583,10 @@@ W:   http://www.tazenda.demon.co.uk/phil/
  S:    Maintained
  
  MAC80211
 -P:    Michael Wu
 -M:    flamingice@sourmilk.net
  P:    Johannes Berg
  M:    johannes@sipsolutions.net
 -P:    Jiri Benc
 -M:    jbenc@suse.cz
 +P:    Michael Wu
 +M:    flamingice@sourmilk.net
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/
  T:    git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
@@@ -4356,16 -4383,6 +4381,16 @@@ L:    linux-wireless@vger.kernel.or
  W:    http://oops.ghostprotocols.net:81/blog
  S:    Maintained
  
 +WM97XX TOUCHSCREEN DRIVERS
 +P:    Mark Brown
 +M:    broonie@opensource.wolfsonmicro.com
 +P:    Liam Girdwood
 +M:    liam.girdwood@wolfsonmicro.com
 +L:    linux-input@vger.kernel.org
 +T:    git git://opensource.wolfsonmicro.com/linux-2.6-touch
 +W:    http://opensource.wolfsonmicro.com/node/7
 +S:    Supported
 +
  X.25 NETWORK LAYER
  P:    Henner Eisen
  M:    eis@baty.hanse.de

diff --combined drivers/net/Kconfig
index 015e163259738af5ba3e74dfd69da9bda5d350f2,d46d9498040c74e1dc33d4804b8298cfb7736119..0697aa8ea77459d4c36a7f991007c56b7bd967d2
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -827,7 -827,7 +827,7 @@@ config ULTRA3
  
  config BFIN_MAC
        tristate "Blackfin 527/536/537 on-chip mac support"
 -      depends on NET_ETHERNET && (BF527 || BF537 || BF536) && (!BF537_PORT_H)
 +      depends on NET_ETHERNET && (BF527 || BF537 || BF536)
        select CRC32
        select MII
        select PHYLIB
@@@ -2278,6 -2278,7 +2278,7 @@@ config TSI108_ET
  config GELIC_NET
        tristate "PS3 Gigabit Ethernet driver"
        depends on PPC_PS3
+       select PS3_SYS_MANAGER
        help
          This driver supports the network device on the PS3 game
          console.  This driver has built-in support for Ethernet.