Merge branch 'master' into for-next

1 files changed, 100 insertions, 49 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ec023bc1afb0..b6d6d5119d6e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -162,7 +162,7 @@ L:	linux-serial@vger.kernel.org
 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 @@ M:	Lennert Buytenhek <kernel@wantstofly.org>
 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 @@ 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
 
@@ -974,6 +978,8 @@ S:	Maintained
 F:      arch/arm/plat-samsung/
 F:      arch/arm/plat-s3c24xx/
 F:      arch/arm/plat-s5p/
+F:      drivers/*/*s3c2410*
+F:      drivers/*/*/*s3c2410*
 
 ARM/S3C2410 ARM ARCHITECTURE
 M:      Ben Dooks <ben-linux@fluff.org>
@@ -1256,7 +1262,7 @@ F:	drivers/mmc/host/atmel-mci-regs.h
 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 +1418,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 +1883,7 @@ L:	linux-cris-kernel@axis.com
 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 +2222,7 @@ F:	drivers/net/wan/dscc4.c
 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 +2649,7 @@ FREESCALE QUICC ENGINE UCC UART DRIVER
 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,6 +2774,15 @@ F:	Documentation/isdn/README.gigaset
 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
@@ -3135,6 +3150,12 @@ S:	Maintained
 F:      net/ieee802154/
 F:      drivers/ieee802154/
 
+IKANOS/ADI EAGLE ADSL USB DRIVER
+M:      Matthieu Castet <castet.matthieu@free.fr>
+M:      Stanislaw Gruszka <stf_xl@wp.pl>
+S:      Maintained
+F:      drivers/usb/atm/ueagle-atm.c
+
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 M:      Mimi Zohar <zohar@us.ibm.com>
 S:      Supported
@@ -3146,7 +3167,7 @@ S:	Orphan
 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
@@ -3323,7 +3344,6 @@ F:	drivers/net/wimax/i2400m/
 F:      include/linux/wimax/i2400m.h
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
-M:      Reinette Chatre <reinette.chatre@intel.com>
 M:      Wey-Yi Guy <wey-yi.w.guy@intel.com>
 M:      Intel Linux Wireless <ilw@linux.intel.com>
 L:      linux-wireless@vger.kernel.org
@@ -3350,7 +3370,7 @@ IOC3 SERIAL DRIVER
 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>
@@ -3528,7 +3548,7 @@ JSM Neo PCI based serial card
 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>
@@ -3671,6 +3691,28 @@ F:	include/linux/key-type.h
 F:      include/keys/
 F:      security/keys/
 
+KEYS-TRUSTED
+M:      David Safford <safford@watson.ibm.com>
+M:      Mimi Zohar <zohar@us.ibm.com>
+L:      linux-security-module@vger.kernel.org
+L:      keyrings@linux-nfs.org
+S:      Supported
+F:      Documentation/keys-trusted-encrypted.txt
+F:      include/keys/trusted-type.h
+F:      security/keys/trusted.c
+F:      security/keys/trusted.h
+
+KEYS-ENCRYPTED
+M:      Mimi Zohar <zohar@us.ibm.com>
+M:      David Safford <safford@watson.ibm.com>
+L:      linux-security-module@vger.kernel.org
+L:      keyrings@linux-nfs.org
+S:      Supported
+F:      Documentation/keys-trusted-encrypted.txt
+F:      include/keys/encrypted-type.h
+F:      security/keys/encrypted.c
+F:      security/keys/encrypted.h
+
 KGDB / KDB /debug_core
 M:      Jason Wessel <jason.wessel@windriver.com>
 W:      http://kgdb.wiki.kernel.org/
@@ -3678,14 +3720,14 @@ L:	kgdb-bugreport@lists.sourceforge.net
 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/
 
 KMEMCHECK
 M:      Vegard Nossum <vegardno@ifi.uio.no>
-M:      Pekka Enberg <penberg@cs.helsinki.fi>
+M:      Pekka Enberg <penberg@kernel.org>
 S:      Maintained
 F:      Documentation/kmemcheck.txt
 F:      arch/x86/include/asm/kmemcheck.h
@@ -4559,7 +4601,7 @@ F:	drivers/i2c/busses/i2c-ocores.c
 
 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
@@ -5273,8 +5315,7 @@ S:	Supported
 F:      drivers/s390/net/
 
 S390 ZCRYPT DRIVER
-M:      Felix Beck <felix.beck@de.ibm.com>
-M:      Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
+M:      Holger Dengler <hd@linux.vnet.ibm.com>
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
@@ -5520,12 +5561,11 @@ S:	Supported
 F:      drivers/scsi/be2iscsi/
 
 SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
-M:      Sathya Perla <sathyap@serverengines.com>
-M:      Subbu Seetharaman <subbus@serverengines.com>
-M:      Sarveshwar Bandi <sarveshwarb@serverengines.com>
-M:      Ajit Khaparde <ajitk@serverengines.com>
+M:      Sathya Perla <sathya.perla@emulex.com>
+M:      Subbu Seetharaman <subbu.seetharaman@emulex.com>
+M:      Ajit Khaparde <ajit.khaparde@emulex.com>
 L:      netdev@vger.kernel.org
-W:      http://www.serverengines.com
+W:      http://www.emulex.com
 S:      Supported
 F:      drivers/net/benet/
 
@@ -5547,7 +5587,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
@@ -5569,7 +5609,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 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*
 
@@ -5585,18 +5625,20 @@ F:	include/linux/sfi*.h
 
 SIMTEC EB110ATX (Chalice CATS)
 P:      Ben Dooks
-M:      Vincent Sanders <support@simtec.co.uk>
+P:      Vincent Sanders <vince@simtec.co.uk>
+M:      Simtec Linux Team <linux@simtec.co.uk>
 W:      http://www.simtec.co.uk/products/EB110ATX/
 S:      Supported
 
 SIMTEC EB2410ITX (BAST)
 P:      Ben Dooks
-M:      Vincent Sanders <support@simtec.co.uk>
+P:      Vincent Sanders <vince@simtec.co.uk>
+M:      Simtec Linux Team <linux@simtec.co.uk>
 W:      http://www.simtec.co.uk/products/EB2410ITX/
 S:      Supported
-F:      arch/arm/mach-s3c2410/
-F:      drivers/*/*s3c2410*
-F:      drivers/*/*/*s3c2410*
+F:      arch/arm/mach-s3c2410/mach-bast.c
+F:      arch/arm/mach-s3c2410/bast-ide.c
+F:      arch/arm/mach-s3c2410/bast-irq.c
 
 TI DAVINCI MACHINE SUPPORT
 M:      Kevin Hilman <khilman@deeprootsystems.com>
@@ -5648,7 +5690,7 @@ F:	drivers/net/sky2.*
 
 SLAB ALLOCATOR
 M:      Christoph Lameter <cl@linux-foundation.org>
-M:      Pekka Enberg <penberg@cs.helsinki.fi>
+M:      Pekka Enberg <penberg@kernel.org>
 M:      Matt Mackall <mpm@selenic.com>
 L:      linux-mm@kvack.org
 S:      Maintained
@@ -5789,14 +5831,14 @@ L:	sparclinux@vger.kernel.org
 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>
@@ -6126,8 +6168,8 @@ TTY LAYER
 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
@@ -6571,6 +6613,16 @@ S:	Maintained
 F:      drivers/char/virtio_console.c
 F:      include/linux/virtio_console.h
 
+VIRTIO CORE, NET AND BLOCK DRIVERS
+M:      Rusty Russell <rusty@rustcorp.com.au>
+M:      "Michael S. Tsirkin" <mst@redhat.com>
+L:      virtualization@lists.linux-foundation.org
+S:      Maintained
+F:      drivers/virtio/
+F:      drivers/net/virtio_net.c
+F:      drivers/block/virtio_blk.c
+F:      include/linux/virtio_*.h
+
 VIRTIO HOST (VHOST)
 M:      "Michael S. Tsirkin" <mst@redhat.com>
 L:      kvm@vger.kernel.org
@@ -6593,13 +6645,12 @@ F:	Documentation/i2c/busses/i2c-viapro
 F:      drivers/i2c/busses/i2c-viapro.c
 
 VIA SD/MMC CARD CONTROLLER DRIVER
-M:      Joseph Chan <JosephChan@via.com.tw>
+M:      Bruce Chang <brucechang@via.com.tw>
 M:      Harald Welte <HaraldWelte@viatech.com>
 S:      Maintained
 F:      drivers/mmc/host/via-sdmmc.c
 
 VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
-M:      Joseph Chan <JosephChan@via.com.tw>
 M:      Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
 L:      linux-fbdev@vger.kernel.org
 S:      Maintained
@@ -6745,12 +6796,12 @@ S:	Maintained
 F:      drivers/net/wireless/wl1251/*
 
 WL1271 WIRELESS DRIVER
-M:      Luciano Coelho <luciano.coelho@nokia.com>
+M:      Luciano Coelho <coelho@ti.com>
 L:      linux-wireless@vger.kernel.org
-W:      http://wireless.kernel.org
+W:      http://wireless.kernel.org/en/users/Drivers/wl12xx
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
 S:      Maintained
-F:      drivers/net/wireless/wl12xx/wl1271*
+F:      drivers/net/wireless/wl12xx/
 F:      include/linux/wl12xx.h
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
@@ -6873,7 +6924,7 @@ XILINX UARTLITE SERIAL DRIVER
 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>
@@ -6919,7 +6970,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>