Merge branch 'devicetree/merge' into spi/merge

diff --combined MAINTAINERS
index 2f61f678249ab19ab6883b230ff3f23dec6e8583,d29839e46a6905d2f15b45c96629b05ea64fb9a7..6d6d6bdba3a6a0080f2ecc36aeb709b4a63ed705
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -162,7 -162,7 +162,7 @@@ L: linux-serial@vger.kernel.or
  W:    http://serial.sourceforge.net
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
- F:    drivers/serial/8250*
+ F:    drivers/tty/serial/8250*
  F:    include/linux/serial_8250.h
  
  8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
@@@ -624,11 -624,15 +624,15 @@@ M:      Lennert Buytenhek <kernel@wantstofly
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
- ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
+ ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
  M:    Andrew Victor <linux@maxim.org.za>
+ M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://maxim.org.za/at91_26.html
- S:    Maintained
+ W:    http://www.linux4sam.org
+ S:    Supported
+ F:    arch/arm/mach-at91/
  
  ARM/BCMRING ARM ARCHITECTURE
  M:    Jiandong Zheng <jdzheng@broadcom.com>
@@@ -888,8 -892,8 +892,8 @@@ F: arch/arm/mach-msm
  F:    drivers/video/msm/
  F:    drivers/mmc/host/msm_sdcc.c
  F:    drivers/mmc/host/msm_sdcc.h
- F:    drivers/serial/msm_serial.h
- F:    drivers/serial/msm_serial.c
+ F:    drivers/tty/serial/msm_serial.h
+ F:    drivers/tty/serial/msm_serial.c
  T:    git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
  S:    Maintained
  
@@@ -1256,7 -1260,7 +1260,7 @@@ F:      drivers/mmc/host/atmel-mci-regs.
  ATMEL AT91 / AT32 SERIAL DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  S:    Supported
- F:    drivers/serial/atmel_serial.c
+ F:    drivers/tty/serial/atmel_serial.c
  
  ATMEL LCDFB DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
@@@ -1412,7 -1416,7 +1416,7 @@@ M:      Sonic Zhang <sonic.zhang@analog.com
  L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org
  S:    Supported
- F:    drivers/serial/bfin_5xx.c
+ F:    drivers/tty/serial/bfin_5xx.c
  
  BLACKFIN WATCHDOG DRIVER
  M:    Mike Frysinger <vapier.adi@gmail.com>
@@@ -1877,7 -1881,7 +1881,7 @@@ L:      linux-cris-kernel@axis.co
  W:    http://developer.axis.com
  S:    Maintained
  F:    arch/cris/
- F:    drivers/serial/crisv10.*
+ F:    drivers/tty/serial/crisv10.*
  
  CRYPTO API
  M:    Herbert Xu <herbert@gondor.apana.org.au>
@@@ -2216,7 -2220,7 +2220,7 @@@ F:      drivers/net/wan/dscc4.
  DZ DECSTATION DZ11 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <macro@linux-mips.org>
  S:    Maintained
- F:    drivers/serial/dz.*
+ F:    drivers/tty/serial/dz.*
  
  EATA-DMA SCSI DRIVER
  M:    Michael Neuffer <mike@i-Connect.Net>
@@@ -2643,7 -2647,7 +2647,7 @@@ FREESCALE QUICC ENGINE UCC UART DRIVE
  M:    Timur Tabi <timur@freescale.com>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
- F:    drivers/serial/ucc_uart.c
+ F:    drivers/tty/serial/ucc_uart.c
  
  FREESCALE SOC SOUND DRIVERS
  M:    Timur Tabi <timur@freescale.com>
@@@ -2768,15 -2772,6 +2772,15 @@@ F:    Documentation/isdn/README.gigase
  F:    drivers/isdn/gigaset/
  F:    include/linux/gigaset_dev.h
  
 +GPIO SUBSYSTEM
 +M:    Grant Likely <grant.likely@secretlab.ca>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +T:    git git://git.secretlab.ca/git/linux-2.6.git
 +F:    Documentation/gpio/gpio.txt
 +F:    drivers/gpio/
 +F:    include/linux/gpio*
 +
  GRETH 10/100/1G Ethernet MAC device driver
  M:    Kristoffer Glembo <kristoffer@gaisler.com>
  L:    netdev@vger.kernel.org
@@@ -3155,7 -3150,7 +3159,7 @@@ S:      Orpha
  F:    drivers/video/imsttfb.c
  
  INFINIBAND SUBSYSTEM
- M:    Roland Dreier <rolandd@cisco.com>
+ M:    Roland Dreier <roland@kernel.org>
  M:    Sean Hefty <sean.hefty@intel.com>
  M:    Hal Rosenstock <hal.rosenstock@gmail.com>
  L:    linux-rdma@vger.kernel.org
@@@ -3359,7 -3354,7 +3363,7 @@@ IOC3 SERIAL DRIVE
  M:    Pat Gefre <pfg@sgi.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
- F:    drivers/serial/ioc3_serial.c
+ F:    drivers/tty/serial/ioc3_serial.c
  
  IP MASQUERADING
  M:    Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
@@@ -3536,7 -3531,7 +3540,7 @@@ JSM Neo PCI based serial car
  M:    Breno Leitao <leitao@linux.vnet.ibm.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
- F:    drivers/serial/jsm/
+ F:    drivers/tty/serial/jsm/
  
  K10TEMP HARDWARE MONITORING DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
@@@ -3686,7 -3681,7 +3690,7 @@@ L:      kgdb-bugreport@lists.sourceforge.ne
  S:    Maintained
  F:    Documentation/DocBook/kgdb.tmpl
  F:    drivers/misc/kgdbts.c
- F:    drivers/serial/kgdboc.c
+ F:    drivers/tty/serial/kgdboc.c
  F:    include/linux/kdb.h
  F:    include/linux/kgdb.h
  F:    kernel/debug/
@@@ -4567,7 -4562,7 +4571,7 @@@ F:      drivers/i2c/busses/i2c-ocores.
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <grant.likely@secretlab.ca>
- L:    devicetree-discuss@lists.ozlabs.org
+ L:    devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
@@@ -5554,7 -5549,7 +5558,7 @@@ M:      Pat Gefre <pfg@sgi.com
  L:    linux-ia64@vger.kernel.org
  S:    Supported
  F:    Documentation/ia64/serial.txt
- F:    drivers/serial/ioc?_serial.c
+ F:    drivers/tty/serial/ioc?_serial.c
  F:    include/linux/ioc?.h
  
  SGI VISUAL WORKSTATION 320 AND 540
@@@ -5576,7 -5571,7 +5580,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
  F:    arch/arm/mach-lh7a40x/
- F:    drivers/serial/serial_lh7a40x.c
+ F:    drivers/tty/serial/serial_lh7a40x.c
  F:    drivers/usb/gadget/lh7a40*
  F:    drivers/usb/host/ohci-lh7a40*
  
@@@ -5796,14 -5791,14 +5800,14 @@@ L:   sparclinux@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
  S:    Maintained
- F:    drivers/serial/suncore.c
- F:    drivers/serial/suncore.h
- F:    drivers/serial/sunhv.c
- F:    drivers/serial/sunsab.c
- F:    drivers/serial/sunsab.h
- F:    drivers/serial/sunsu.c
- F:    drivers/serial/sunzilog.c
- F:    drivers/serial/sunzilog.h
+ F:    drivers/tty/serial/suncore.c
+ F:    drivers/tty/serial/suncore.h
+ F:    drivers/tty/serial/sunhv.c
+ F:    drivers/tty/serial/sunsab.c
+ F:    drivers/tty/serial/sunsab.h
+ F:    drivers/tty/serial/sunsu.c
+ F:    drivers/tty/serial/sunzilog.c
+ F:    drivers/tty/serial/sunzilog.h
  
  SPEAR PLATFORM SUPPORT
  M:    Viresh Kumar <viresh.kumar@st.com>
@@@ -6133,8 -6128,8 +6137,8 @@@ TTY LAYE
  M:    Greg Kroah-Hartman <gregkh@suse.de>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
- F:    drivers/char/tty_*
- F:    drivers/serial/serial_core.c
+ F:    drivers/tty/*
+ F:    drivers/tty/serial/serial_core.c
  F:    include/linux/serial_core.h
  F:    include/linux/serial.h
  F:    include/linux/tty.h
@@@ -6879,7 -6874,7 +6883,7 @@@ XILINX UARTLITE SERIAL DRIVE
  M:    Peter Korsgaard <jacmet@sunsite.dk>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
- F:    drivers/serial/uartlite.c
+ F:    drivers/tty/serial/uartlite.c
  
  YAM DRIVER FOR AX.25
  M:    Jean-Paul Roubelat <jpr@f6fbb.org>
@@@ -6925,7 -6920,7 +6929,7 @@@ F:      drivers/media/video/zoran
  ZS DECSTATION Z85C30 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <macro@linux-mips.org>
  S:    Maintained
- F:    drivers/serial/zs.*
+ F:    drivers/tty/serial/zs.*
  
  GRE DEMULTIPLEXER DRIVER
  M:    Dmitry Kozlov <xeb@mail.ru>