Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5446/1: ohci-at91: Limit vbus_pin assignment to the size of the array
  [ARM] 5445/1: AT91: Remove flexible array from USBH platform data
  [ARM] 5447/1: Add SZ_32K
  [ARM] omap: fix omap1 clock usecount decrement bug
  [ARM] pxa: register AC97 controller devices
  [ARM] pxa/csb701: do not register devices on non-csb726 boads
  [ARM] pxa/colibri: get rid of set_irq_type()
  [ARM] pxa/colibri: provide MAC address from ATAG_SERIAL
  [ARM] pxa/cm-x2xx: fix ucb1400 not being registered
  [ARM] pxa: Add support for suspend on PalmTX, T5 and LD
  [ARM] pxa: PalmTE2 support for battery, UDC, IrDA and backlight
  [ARM] pxa: Palm Tungsten E2 basic support
  [ARM] pxa/em-x270: add libertas device registration
  [ARM] pxa/magician: Enable bq24022 regulator for gpio_vbus and pda_power

diff --combined MAINTAINERS
index d96e745,4e7da96..1f02d96
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -636,7 -636,7 +636,7 @@@ P: Dirk Opfe
  M:    dirk@opfer-online.de
  S:    Maintained
  
- ARM/PALMTX,PALMT5,PALMLD SUPPORT
+ ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
  P:    Marek Vasut
  M:    marek.vasut@gmail.com
  W:    http://hackndev.com
@@@ -1544,6 -1544,7 +1544,6 @@@ S:      Maintaine
  DVB SUBSYSTEM AND DRIVERS
  P:    LinuxTV.org Project
  M:    linux-media@vger.kernel.org
 -L:    linux-dvb@linuxtv.org (subscription required)
  W:    http://linuxtv.org/
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
@@@ -3057,7 -3058,7 +3057,7 @@@ S:      Supporte
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  P:    Pierre Ossman
 -M:    drzeus-mmc@drzeus.cx
 +M:    pierre@ossman.eu
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
@@@ -3244,13 -3245,6 +3244,13 @@@ M:    andi@lisas.d
  L:    netdev@vger.kernel.org
  S:    Maintained
  
 +NILFS2 FILESYSTEM
 +P:    KONISHI Ryusuke
 +M:    konishi.ryusuke@lab.ntt.co.jp
 +L:    users@nilfs.org
 +W:    http://www.nilfs.org/en/
 +S:    Supported
 +
  NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER
  P:    YOKOTA Hiroshi
  M:    yokota@netlab.is.tsukuba.ac.jp
@@@ -3939,7 -3933,7 +3939,7 @@@ S:      Maintaine
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
  P:    Pierre Ossman
 -M:    drzeus-sdhci@drzeus.cx
 +M:    pierre@ossman.eu
  L:    sdhci-devel@lists.ossman.eu
  S:    Maintained
  
@@@ -4926,7 -4920,7 +4926,7 @@@ S:      Maintaine
  
  W83L51xD SD/MMC CARD INTERFACE DRIVER
  P:    Pierre Ossman
 -M:    drzeus-wbsd@drzeus.cx
 +M:    pierre@ossman.eu
  L:    linux-kernel@vger.kernel.org
  S:    Maintained