Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4680/1: parentheses around NR_IRQS definition
  [ARM] 4679/1: AT91: Change maintainer email address
  [ARM] 4675/1: pxa: fix mfp address definition error for pxa320
  [ARM] 4674/1: pxa: increase LCD PCLK drive strength to fast 2mA for PXA300/PXA310
  [ARM] 4673/1: pxa: add missing IRQ_SSP4 definitions for PXA3xx
  [ARM] 4672/1: pxa: fix DRCMR(n) to support PXA27x and later processors
  [ARM] 4665/1: fix __und_usr wrt accessing the undefined insn in user space
  [ARM] 4659/1: remove possibilities for spurious false negative with __kuser_cmpxchg
  [ARM] 4661/1: fix do_undefinstr wrt the enabling of IRQs
  [ARM] uengine: fix memset size error
  [ARM] 4648/1: i.MX/MX1 ensure more complete AITC initialization
  [ARM] 4611/2: AT91: Fix GPIO buttons pins on SAM9261-EK.
  [ARM] 4650/1: AT91: New-style init of I2C, support for i2c-gpio
  [ARM] 4604/2: AT91: Master clock divistor on SAM9
  [ARM] 4662/1: Fix PXA serial driver compilation if SERIAL_PXA_CONSOLE is disabled
  [ARM] PXA ssp: unlock when ssp tries to close an invalid port
  [ARM] 4654/1: pxa: update default MFP register value
  [ARM] 4653/1: pxa: fix a gpio typo in mfp-pxa320.h
  [ARM] 4652/1: pxa: fix a typo of pxa27x usb host clk definition
  [ARM] 4651/1: pxa: add PXA3xx specific IRQ definitions

diff --combined MAINTAINERS
index ac425b5b4a409bd4a67f5a708d5f9c363240d10e,77c083dc5abef1f69746bdc5a14b4b13dba5b326..7c8392e1797d9f33301705a8fd89adf5c5c05553
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -323,7 -323,8 +323,7 @@@ S: Maintaine
  ALCATEL SPEEDTOUCH USB DRIVER
  P:    Duncan Sands
  M:    duncan.sands@free.fr
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:    linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org/SpeedTouch/
  S:    Maintained
  
@@@ -439,7 -440,7 +439,7 @@@ S: Maintaine
  
  ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
  P:      Andrew Victor
- M:      andrew@sanpeople.com
+ M:      linux@maxim.org.za
  L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
  W:      http://maxim.org.za/at91_26.html
  S:      Maintained
@@@ -1042,7 -1043,7 +1042,7 @@@ S:      Maintaine
  CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
  P:    Lennert Buytenhek
  M:    kernel@wantstofly.org
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:    linux-usb@vger.kernel.org
  S:    Maintained
  
  CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
@@@ -1551,7 -1552,7 +1551,7 @@@ S:      Maintaine
  FREESCALE HIGHSPEED USB DEVICE DRIVER
  P:    Li Yang
  M:    leoli@freescale.com
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:    linux-usb@vger.kernel.org
  L:    linuxppc-dev@ozlabs.org
  S:    Maintained
  
@@@ -1913,8 -1914,10 +1913,8 @@@ L:     linux1394-devel@lists.sourceforge.ne
  S:    Maintained
  
  IMS TWINTURBO FRAMEBUFFER DRIVER
 -P:    Paul Mundt
 -M:    lethal@chaoticdreams.org
  L:    linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 -S:    Maintained
 +S:    Orphan
  
  INFINIBAND SUBSYSTEM
  P:    Roland Dreier
@@@ -2110,14 -2113,6 +2110,14 @@@ L:    irda-users@lists.sourceforge.net (su
  W:    http://irda.sourceforge.net/
  S:    Maintained
  
 +ISCSI
 +P:    Mike Christie
 +M:    michaelc@cs.wisc.edu
 +L:    open-iscsi@googlegroups.com
 +W:    www.open-iscsi.org
 +T:    git kernel.org:/pub/scm/linux/kernel/mnc/linux-2.6-iscsi.git
 +S:    Maintained
 +
  ISAPNP
  P:    Jaroslav Kysela
  M:    perex@perex.cz
@@@ -2451,7 -2446,7 +2451,7 @@@ M68K ON APPLE MACINTOS
  P:    Joshua Thompson
  M:    funaho@jurai.org
  W:    http://www.mac.linux-m68k.org/
 -L:    linux-mac68k@mac.linux-m68k.org
 +L:    linux-m68k@lists.linux-m68k.org
  S:    Maintained
  
  M68K ON HP9000/300
@@@ -3641,12 -3636,18 +3641,12 @@@ M:   laredo@gnu.or
  W:    http://www.stradis.com/
  S:    Maintained
  
 -SUPERH (sh)
 +SUPERH
  P:    Paul Mundt
  M:    lethal@linux-sh.org
 -L:    linuxsh-dev@lists.sourceforge.net (subscribers-only)
 -W:    http://www.linux-sh.org
 -S:    Maintained
 -
 -SUPERH64 (sh64)
 -P:    Paul Mundt
 -M:    lethal@linux-sh.org
 -L:    linuxsh-shmedia-dev@lists.sourceforge.net
 +L:    linux-sh@vger.kernel.org
  W:    http://www.linux-sh.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git
  S:    Maintained
  
  SUN3/3X
@@@ -3732,7 -3733,7 +3732,7 @@@ S:      Maintaine
  TLAN NETWORK DRIVER
  P:    Samuel Chessman
  M:    chessman@tux.org
 -L:    tlan-devel@lists.sourceforge.net
 +L:    tlan-devel@lists.sourceforge.net (subscribers-only)
  W:    http://sourceforge.net/projects/tlan/
  S:    Maintained
  
@@@ -3817,20 -3818,22 +3817,20 @@@ S:   Maintaine
  USB ACM DRIVER
  P:    Oliver Neukum
  M:    oliver@neukum.name
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:    linux-usb@vger.kernel.org
  S:    Maintained
  
  USB BLOCK DRIVER (UB ub)
  P:    Pete Zaitcev
  M:    zaitcev@redhat.com
  L:    linux-kernel@vger.kernel.org
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Supported
  
  USB CDC ETHERNET DRIVER
  P:    Greg Kroah-Hartman
  M:    greg@kroah.com
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Maintained
  W:    http://www.kroah.com/linux-usb/
  
@@@ -3844,13 -3847,13 +3844,13 @@@ S:   Maintaine
  USB EHCI DRIVER
  P:    David Brownell
  M:    dbrownell@users.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Odd Fixes
  
  USB ET61X[12]51 DRIVER
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  L:    video4linux-list@redhat.com
  W:    http://www.linux-projects.org
  S:    Maintained
@@@ -3858,33 -3861,41 +3858,33 @@@
  USB GADGET/PERIPHERAL SUBSYSTEM
  P:    David Brownell
  M:    dbrownell@users.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org/gadget
  S:    Maintained
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
  P:    Jiri Kosina
  M:    jkosina@suse.cz
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
  
 -USB HUB DRIVER
 -P:    Johannes Erdfelt
 -M:    johannes@erdfelt.com
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 -S:    Maintained
 -
  USB ISP116X DRIVER
  P:    Olav Kongas
  M:    ok@artecdesign.ee
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Maintained
  
  USB KAWASAKI LSI DRIVER
  P:    Oliver Neukum
  M:    oliver@neukum.name
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Maintained
  
  USB MASS STORAGE DRIVER
  P:    Matthew Dharm
  M:    mdharm-usb@one-eyed-alien.net
 -L:    linux-usb-users@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  L:    usb-storage@lists.one-eyed-alien.net
  S:    Maintained
  W:    http://www.one-eyed-alien.net/~mdharm/linux-usb/
@@@ -3892,26 -3903,28 +3892,26 @@@
  USB OHCI DRIVER
  P:    David Brownell
  M:    dbrownell@users.sourceforge.net
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Odd Fixes
  
  USB OPTION-CARD DRIVER
  P:    Matthias Urlichs
  M:    smurf@smurf.noris.de
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Maintained
  
  USB OV511 DRIVER
  P:    Mark McClelland
  M:    mmcclell@bigfoot.com
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  W:    http://alpha.dyndns.org/ov511/
  S:    Maintained
  
  USB PEGASUS DRIVER
  P:    Petko Manolov
  M:    petkan@users.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  L:    netdev@vger.kernel.org
  W:    http://pegasus2.sourceforge.net/
  S:    Maintained
@@@ -3919,13 -3932,14 +3919,13 @@@
  USB PRINTER DRIVER (usblp)
  P:    Pete Zaitcev
  M:    zaitcev@redhat.com
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Supported
  
  USB RTL8150 DRIVER
  P:    Petko Manolov
  M:    petkan@users.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  L:    netdev@vger.kernel.org
  W:    http://pegasus2.sourceforge.net/
  S:    Maintained
@@@ -3933,7 -3947,8 +3933,7 @@@
  USB SE401 DRIVER
  P:    Jeroen Vreeken
  M:    pe1rxq@amsat.org
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  W:    http://www.chello.nl/~j.vreeken/se401/
  S:    Maintained
  
@@@ -3947,59 -3962,72 +3947,59 @@@ USB SERIAL DIGI ACCELEPORT DRIVE
  P:    Peter Berger and Al Borchers
  M:    pberger@brimson.com
  M:    alborchers@steinerpoint.com
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Maintained
  
  USB SERIAL DRIVER
  P:    Greg Kroah-Hartman
  M:    gregkh@suse.de
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Supported
  
  USB SERIAL BELKIN F5U103 DRIVER
  P:    William Greathouse
  M:    wgreathouse@smva.com
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Maintained
  
  USB SERIAL CYPRESS M8 DRIVER
  P:    Lonnie Mendez
  M:    dignome@gmail.com
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Maintained
  W:    http://geocities.com/i0xox0i
  W:    http://firstlight.net/cvs
  
 -USB SERIAL CYBERJACK PINPAD/E-COM DRIVER
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 -S:    Maintained
 -
  USB AUERSWALD DRIVER
  P:    Wolfgang Muees
  M:    wolfgang@iksw-muees.de
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Maintained
  
  USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER
  P:    Gary Brubaker
  M:    xavyer@ix.netcom.com
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Maintained
  
  USB SERIAL KEYSPAN DRIVER
  P:    Greg Kroah-Hartman
  M:    greg@kroah.com
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  W:    http://www.kroah.com/linux/
  S:    Maintained
  
  USB SERIAL WHITEHEAT DRIVER
  P:    Support Department
  M:    support@connecttech.com
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  W:    http://www.connecttech.com
  S:    Supported
  
  USB SN9C1xx DRIVER
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  L:    video4linux-list@redhat.com
  W:    http://www.linux-projects.org
  S:    Maintained
@@@ -4007,7 -4035,8 +4007,7 @@@
  USB SUBSYSTEM
  P:    Greg Kroah-Hartman
  M:    gregkh@suse.de
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org
  T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
  S:    Supported
@@@ -4015,7 -4044,8 +4015,7 @@@
  USB UHCI DRIVER
  P:    Alan Stern
  M:    stern@rowland.harvard.edu
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  S:    Maintained
  
  USB "USBNET" DRIVER FRAMEWORK
@@@ -4028,7 -4058,7 +4028,7 @@@ S:      Maintaine
  USB W996[87]CF DRIVER
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  L:    video4linux-list@redhat.com
  W:    http://www.linux-projects.org
  S:    Maintained
@@@ -4036,7 -4066,7 +4036,7 @@@
  USB ZC0301 DRIVER
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  L:    video4linux-list@redhat.com
  W:    http://www.linux-projects.org
  S:    Maintained
@@@ -4044,14 -4074,15 +4044,14 @@@
  USB ZD1201 DRIVER
  P:    Jeroen Vreeken
  M:    pe1rxq@amsat.org
 -L:    linux-usb-users@lists.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  W:    http://linux-lc100020.sourceforge.net
  S:    Maintained
  
  USB ZR364XX DRIVER
  P:    Antoine Jacquet
  M:    royale@zerezo.com
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:      linux-usb@vger.kernel.org
  L:    video4linux-list@redhat.com
  W:    http://royale.zerezo.com/zr364xx/
  S:    Maintained