Merge tag 'v3.9-rc3' into drm-intel-next-queued

Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in

commit a321e91b6d73ed011ffceed384c40d2785cf723b
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 27 17:02:56 2013 -0800

    lib/scatterlist: add simple page iterator

The merge itself is just two trivial conflicts:

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 434 insertions, 78 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 35a56bcd5e75..50b4d735f961 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -97,12 +97,13 @@ Descriptions of section entries:
            X:   net/ipv6/
            matches all files in and below net excluding net/ipv6/
         K: Keyword perl extended regex pattern to match content in a
-           patch or file.  For instance:
+           patch or file, or an affected filename.  For instance:
            K: of_get_profile
-              matches patches or files that contain "of_get_profile"
+              matches patch or file content, or filenames, that contain
+              "of_get_profile"
            K: \b(printk|pr_(info|err))\b
-              matches patches or files that contain one or more of the words
-              printk, pr_info or pr_err
+              matches patch or file content, or filenames, that contain one or
+              more of the words printk, pr_info or pr_err
            One regex pattern per line.  Multiple K: lines acceptable.
 
 Note: For the hard of thinking, this list is meant to remain in alphabetical
@@ -113,12 +114,6 @@ Maintainers List (try to look for most precise areas first)
 
                 -----------------------------------
 
-3C505 NETWORK DRIVER
-M:      Philip Blundell <philb@gnu.org>
-L:      netdev@vger.kernel.org
-S:      Maintained
-F:      drivers/net/ethernet/i825xx/3c505*
-
 3C59X NETWORK DRIVER
 M:      Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
 L:      netdev@vger.kernel.org
@@ -465,6 +460,14 @@ S:	Maintained
 F:      drivers/scsi/aic7xxx/
 F:      drivers/scsi/aic7xxx_old/
 
+AIMSLAB FM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-aimslab*
+
 AIO
 M:      Benjamin LaHaise <bcrl@kvack.org>
 L:      linux-aio@kvack.org
@@ -559,6 +562,18 @@ L:	linux-rdma@vger.kernel.org
 S:      Maintained
 F:      drivers/infiniband/hw/amso1100/
 
+ANALOG DEVICES INC AD9389B DRIVER
+M:      Hans Verkuil <hans.verkuil@cisco.com>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/i2c/ad9389b*
+
+ANALOG DEVICES INC ADV7604 DRIVER
+M:      Hans Verkuil <hans.verkuil@cisco.com>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/i2c/adv7604*
+
 ANALOG DEVICES INC ASOC CODEC DRIVERS
 M:      Lars-Peter Clausen <lars@metafoo.de>
 L:      device-drivers-devel@blackfin.uclinux.org
@@ -670,8 +685,16 @@ F:	drivers/input/serio/ambakmi.*
 F:      include/linux/amba/kmi.h
 
 ARM PRIMECELL MMCI PL180/1 DRIVER
-S:      Orphan
+M:      Russell King <linux@arm.linux.org.uk>
+S:      Maintained
 F:      drivers/mmc/host/mmci.*
+F:      include/linux/amba/mmci.h
+
+ARM PRIMECELL UART PL010 AND PL011 DRIVERS
+M:      Russell King <linux@arm.linux.org.uk>
+S:      Maintained
+F:      drivers/tty/serial/amba-pl01*.c
+F:      include/linux/amba/serial.h
 
 ARM PRIMECELL BUS SUPPORT
 M:      Russell King <linux@arm.linux.org.uk>
@@ -1118,6 +1141,14 @@ F:	arch/arm/mach-s5pv210/mach-goni.c
 F:      arch/arm/mach-exynos/mach-universal_c210.c
 F:      arch/arm/mach-exynos/mach-nuri.c
 
+ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
+M:      Kyungmin Park <kyungmin.park@samsung.com>
+M:      Kamil Debski <k.debski@samsung.com>
+L:      linux-arm-kernel@lists.infradead.org
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/platform/s5p-g2d/
+
 ARM/SAMSUNG S5P SERIES FIMC SUPPORT
 M:      Kyungmin Park <kyungmin.park@samsung.com>
 M:      Sylwester Nawrocki <s.nawrocki@samsung.com>
@@ -1248,12 +1279,17 @@ M:	Tony Prisk <linux@prisktech.co.nz>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-vt8500/
+F:      drivers/clocksource/vt8500_timer.c
+F:      drivers/gpio/gpio-vt8500.c
+F:      drivers/mmc/host/wmt-sdmmc.c
+F:      drivers/pwm/pwm-vt8500.c
+F:      drivers/rtc/rtc-vt8500.c
+F:      drivers/tty/serial/vt8500_serial.c
+F:      drivers/usb/host/ehci-vt8500.c
+F:      drivers/usb/host/uhci-platform.c
 F:      drivers/video/vt8500lcdfb.*
 F:      drivers/video/wm8505fb*
 F:      drivers/video/wmt_ge_rops.*
-F:      drivers/tty/serial/vt8500_serial.c
-F:      drivers/rtc/rtc-vt8500.c
-F:      drivers/mmc/host/wmt-sdmmc.c
 
 ARM/ZIPIT Z2 SUPPORT
 M:      Marek Vasut <marek.vasut@gmail.com>
@@ -1262,6 +1298,14 @@ S:	Maintained
 F:      arch/arm/mach-pxa/z2.c
 F:      arch/arm/mach-pxa/include/mach/z2.h
 
+ARM/ZYNQ ARCHITECTURE
+M:      Michal Simek <michal.simek@xilinx.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+W:      http://wiki.xilinx.com
+T:      git git://git.xilinx.com/linux-xlnx.git
+S:      Supported
+F:      arch/arm/mach-zynq/
+
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:      Catalin Marinas <catalin.marinas@arm.com>
 M:      Will Deacon <will.deacon@arm.com>
@@ -1270,6 +1314,14 @@ S:	Maintained
 F:      arch/arm64/
 F:      Documentation/arm64/
 
+AS3645A LED FLASH CONTROLLER DRIVER
+M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/i2c/as3645a.c
+F:      include/media/as3645a.h
+
 ASC7621 HARDWARE MONITOR DRIVER
 M:      George Joseph <george.joseph@fairview5.com>
 L:      lm-sensors@lm-sensors.org
@@ -1303,7 +1355,7 @@ F:	include/linux/dmaengine.h
 F:      include/linux/async_tx.h
 
 AT24 EEPROM DRIVER
-M:      Wolfram Sang <w.sang@pengutronix.de>
+M:      Wolfram Sang <wsa@the-dreams.de>
 L:      linux-i2c@vger.kernel.org
 S:      Maintained
 F:      drivers/misc/eeprom/at24.c
@@ -1517,6 +1569,14 @@ T:	git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      drivers/media/usb/dvb-usb-v2/az6007.c
 
+AZTECH FM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-aztech*
+
 B43 WIRELESS DRIVER
 M:      Stefano Brivio <stefano.brivio@polimi.it>
 L:      linux-wireless@vger.kernel.org
@@ -1616,6 +1676,15 @@ W:	http://blackfin.uclinux.org/
 S:      Supported
 F:      drivers/i2c/busses/i2c-bfin-twi.c
 
+BLACKFIN MEDIA DRIVER
+M:      Scott Jiang <scott.jiang.linux@gmail.com>
+L:      uclinux-dist-devel@blackfin.uclinux.org
+W:      http://blackfin.uclinux.org/
+S:      Supported
+F:      drivers/media/platform/blackfin/
+F:      drivers/media/i2c/adv7183*
+F:      drivers/media/i2c/vs6624*
+
 BLINKM RGB LED DRIVER
 M:      Jan-Simon Moeller <jansimon.moeller@gmx.de>
 S:      Maintained
@@ -1725,7 +1794,8 @@ F:	drivers/bcma/
 F:      include/linux/bcma/
 
 BROCADE BFA FC SCSI DRIVER
-M:      Krishna C Gudipati <kgudipat@brocade.com>
+M:      Anil Gurumurthy <agurumur@brocade.com>
+M:      Vijaya Mohan Guvva <vmohan@brocade.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/bfa/
@@ -1799,6 +1869,14 @@ S:	Supported
 F:      Documentation/filesystems/caching/cachefiles.txt
 F:      fs/cachefiles/
 
+CADET FM/AM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-cadet*
+
 CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
 M:      Jonathan Corbet <corbet@lwn.net>
 L:      linux-media@vger.kernel.org
@@ -1935,7 +2013,8 @@ F:	drivers/misc/*
 
 CHECKPATCH
 M:      Andy Whitcroft <apw@canonical.com>
-S:      Supported
+M:      Joe Perches <joe@perches.com>
+S:      Maintained
 F:      scripts/checkpatch.pl
 
 CHINESE DOCUMENTATION
@@ -1990,8 +2069,8 @@ S:	Maintained
 F:      include/linux/clk.h
 
 CISCO FCOE HBA DRIVER
-M:      Abhijeet Joglekar <abjoglek@cisco.com>
-M:      Venkata Siva Vijayendra Bhamidipati <vbhamidi@cisco.com>
+M:      Hiral Patel <hiralpat@cisco.com>
+M:      Suma Ramars <sramars@cisco.com>
 M:      Brian Uchino <buchino@cisco.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
@@ -2140,10 +2219,10 @@ S:	Maintained
 F:      tools/power/cpupower
 
 CPUSETS
-M:      Paul Menage <paul@paulmenage.org>
+M:      Li Zefan <lizefan@huawei.com>
 W:      http://www.bullopensource.org/cpuset/
 W:      http://oss.sgi.com/projects/cpusets/
-S:      Supported
+S:      Maintained
 F:      Documentation/cgroups/cpusets.txt
 F:      include/linux/cpuset.h
 F:      kernel/cpuset.c
@@ -2199,6 +2278,15 @@ F:	Documentation/video4linux/cx18.txt
 F:      drivers/media/pci/cx18/
 F:      include/uapi/linux/ivtv*
 
+CX2341X MPEG ENCODER HELPER MODULE
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/i2c/cx2341x*
+F:      include/media/cx2341x*
+
 CX88 VIDEO4LINUX DRIVER
 M:      Mauro Carvalho Chehab <mchehab@redhat.com>
 L:      linux-media@vger.kernel.org
@@ -2267,12 +2355,6 @@ W:	http://www.arm.linux.org.uk/
 S:      Maintained
 F:      drivers/video/cyber2000fb.*
 
-CYCLADES 2X SYNC CARD DRIVER
-M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
-W:      http://oops.ghostprotocols.net:81/blog
-S:      Maintained
-F:      drivers/net/wan/cycx*
-
 CYCLADES ASYNC MUX DRIVER
 W:      http://www.cyclades.com/
 S:      Orphan
@@ -2576,6 +2658,13 @@ S:	Maintained
 F:      drivers/gpu/drm/tegra/
 F:      Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
 
+DSBR100 USB FM RADIO DRIVER
+M:      Alexey Klimov <klimov.linux@gmail.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/radio/dsbr100.c
+
 DSCC4 DRIVER
 M:      Francois Romieu <romieu@fr.zoreil.com>
 L:      netdev@vger.kernel.org
@@ -2803,6 +2892,13 @@ W:	bluesmoke.sourceforge.net
 S:      Maintained
 F:      drivers/edac/e7xxx_edac.c
 
+EDAC-GHES
+M:      Mauro Carvalho Chehab <mchehab@redhat.com>
+L:      linux-edac@vger.kernel.org
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+F:      drivers/edac/ghes-edac.c
+
 EDAC-I82443BXGX
 M:      Tim Small <tim@buttersideup.com>
 L:      linux-edac@vger.kernel.org
@@ -2959,12 +3055,6 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
 F:      drivers/video/s1d13xxxfb.c
 F:      include/video/s1d13xxxfb.h
 
-ETHEREXPRESS-16 NETWORK DRIVER
-M:      Philip Blundell <philb@gnu.org>
-L:      netdev@vger.kernel.org
-S:      Maintained
-F:      drivers/net/ethernet/i825xx/eexpress.*
-
 ETHERNET BRIDGE
 M:      Stephen Hemminger <stephen@networkplumber.org>
 L:      bridge@lists.linux-foundation.org
@@ -2974,11 +3064,6 @@ S:	Maintained
 F:      include/linux/netfilter_bridge/
 F:      net/bridge/
 
-ETHERTEAM 16I DRIVER
-M:      Mika Kuoppala <miku@iki.fi>
-S:      Maintained
-F:      drivers/net/ethernet/fujitsu/eth16i.c
-
 EXT2 FILE SYSTEM
 M:      Jan Kara <jack@suse.cz>
 L:      linux-ext4@vger.kernel.org
@@ -3347,6 +3432,14 @@ W:	http://www.icp-vortex.com/
 S:      Supported
 F:      drivers/scsi/gdt*
 
+GEMTEK FM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-gemtek*
+
 GENERIC GPIO I2C DRIVER
 M:      Haavard Skinnemoen <hskinnemoen@gmail.com>
 S:      Supported
@@ -3750,6 +3843,13 @@ F:	drivers/i2c/busses/i2c-sis96x.c
 F:      drivers/i2c/busses/i2c-via.c
 F:      drivers/i2c/busses/i2c-viapro.c
 
+I2C/SMBUS ISMT DRIVER
+M:      Seth Heasley <seth.heasley@intel.com>
+M:      Neil Horman <nhorman@tuxdriver.com>
+L:      linux-i2c@vger.kernel.org
+F:      drivers/i2c/busses/i2c-ismt.c
+F:      Documentation/i2c/busses/i2c-ismt
+
 I2C/SMBUS STUB DRIVER
 M:      "Mark M. Hoffman" <mhoffman@lightlink.com>
 L:      linux-i2c@vger.kernel.org
@@ -3757,12 +3857,11 @@ S:	Maintained
 F:      drivers/i2c/i2c-stub.c
 
 I2C SUBSYSTEM
-M:      Wolfram Sang <w.sang@pengutronix.de>
+M:      Wolfram Sang <wsa@the-dreams.de>
 M:      "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
 L:      linux-i2c@vger.kernel.org
 W:      http://i2c.wiki.kernel.org/
-T:      quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
-T:      git git://git.pengutronix.de/git/wsa/linux.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 S:      Maintained
 F:      Documentation/i2c/
 F:      drivers/i2c/
@@ -3906,6 +4005,22 @@ M:	Stanislaw Gruszka <stf_xl@wp.pl>
 S:      Maintained
 F:      drivers/usb/atm/ueagle-atm.c
 
+INA209 HARDWARE MONITOR DRIVER
+M:      Guenter Roeck <linux@roeck-us.net>
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+F:      Documentation/hwmon/ina209
+F:      Documentation/devicetree/bindings/i2c/ina209.txt
+F:      drivers/hwmon/ina209.c
+
+INA2XX HARDWARE MONITOR DRIVER
+M:      Guenter Roeck <linux@roeck-us.net>
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+F:      Documentation/hwmon/ina2xx
+F:      drivers/hwmon/ina2xx.c
+F:      include/linux/platform_data/ina2xx.h
+
 INDUSTRY PACK SUBSYSTEM (IPACK)
 M:      Samuel Iglesias Gonsalvez <siglesias@igalia.com>
 M:      Jens Taprogge <jens.taprogge@taprogge.org>
@@ -4216,6 +4331,7 @@ M:	Thomas Gleixner <tglx@linutronix.de>
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 F:      kernel/irq/
+F:      drivers/irqchip/
 
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 M:      Benjamin Herrenschmidt <benh@kernel.crashing.org>
@@ -4233,6 +4349,14 @@ F:	Documentation/isapnp.txt
 F:      drivers/pnp/isapnp/
 F:      include/linux/isapnp.h
 
+ISA RADIO MODULE
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-isa*
+
 iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
 M:      Peter Jones <pjones@redhat.com>
 M:      Konrad Rzeszutek Wilk <konrad@kernel.org>
@@ -4391,6 +4515,14 @@ W:	http://lse.sourceforge.net/kdump/
 S:      Maintained
 F:      Documentation/kdump/
 
+KEENE FM RADIO TRANSMITTER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-keene*
+
 KERNEL AUTOMOUNTER v4 (AUTOFS4)
 M:      Ian Kent <raven@themaw.net>
 L:      autofs@vger.kernel.org
@@ -4481,6 +4613,15 @@ F:	arch/s390/include/asm/kvm*
 F:      arch/s390/kvm/
 F:      drivers/s390/kvm/
 
+KERNEL VIRTUAL MACHINE (KVM) FOR ARM
+M:      Christoffer Dall <cdall@cs.columbia.edu>
+L:      kvmarm@lists.cs.columbia.edu
+W:      http://systems.cs.columbia.edu/projects/kvm-arm
+S:      Maintained
+F:      arch/arm/include/uapi/asm/kvm*
+F:      arch/arm/include/asm/kvm*
+F:      arch/arm/kvm/
+
 KEXEC
 M:      Eric Biederman <ebiederm@xmission.com>
 W:      http://kernel.org/pub/linux/utils/kernel/kexec/
@@ -4869,6 +5010,13 @@ Q:	http://patchwork.linuxtv.org/project/linux-media/list/
 S:      Maintained
 F:      drivers/media/dvb-frontends/m88rs2000*
 
+MA901 MASTERKIT USB FM RADIO DRIVER
+M:      Alexey Klimov <klimov.linux@gmail.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/radio/radio-ma901.c
+
 MAC80211
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linux-wireless@vger.kernel.org
@@ -4966,6 +5114,23 @@ S:	Maintained
 F:      Documentation/hwmon/max6650
 F:      drivers/hwmon/max6650.c
 
+MAX6697 HARDWARE MONITOR DRIVER
+M:      Guenter Roeck <linux@roeck-us.net>
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+F:      Documentation/hwmon/max6697
+F:      Documentation/devicetree/bindings/i2c/max6697.txt
+F:      drivers/hwmon/max6697.c
+F:      include/linux/platform_data/max6697.h
+
+MAXIRADIO FM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/radio-maxiradio*
+
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 M:      Mauro Carvalho Chehab <mchehab@redhat.com>
 P:      LinuxTV.org Project
@@ -4988,6 +5153,14 @@ F:	include/uapi/linux/meye.h
 F:      include/uapi/linux/ivtv*
 F:      include/uapi/linux/uvcvideo.h
 
+MEDIAVISION PRO MOVIE STUDIO DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/parport/pms*
+
 MEGARAID SCSI DRIVERS
 M:      Neela Syam Kolli <megaraidlinux@lsi.com>
 L:      linux-scsi@vger.kernel.org
@@ -5010,6 +5183,10 @@ L:	linux-mm@kvack.org
 W:      http://www.linux-mm.org
 S:      Maintained
 F:      include/linux/mm.h
+F:      include/linux/gfp.h
+F:      include/linux/mmzone.h
+F:      include/linux/memory_hotplug.h
+F:      include/linux/vmalloc.h
 F:      mm/
 
 MEMORY RESOURCE CONTROLLER
@@ -5034,6 +5211,18 @@ F:	drivers/mtd/
 F:      include/linux/mtd/
 F:      include/uapi/mtd/
 
+METAG ARCHITECTURE
+M:      James Hogan <james.hogan@imgtec.com>
+S:      Supported
+F:      arch/metag/
+F:      Documentation/metag/
+F:      Documentation/devicetree/bindings/metag/
+F:      drivers/clocksource/metag_generic.c
+F:      drivers/irqchip/irq-metag.c
+F:      drivers/irqchip/irq-metag-ext.c
+F:      drivers/tty/metag_da.c
+F:      fs/imgdafs/
+
 MICROBLAZE ARCHITECTURE
 M:      Michal Simek <monstr@monstr.eu>
 L:      microblaze-uclinux@itee.uq.edu.au (moderated for non-subscribers)
@@ -5057,6 +5246,14 @@ S:	Supported
 F:      Documentation/mips/
 F:      arch/mips/
 
+MIROSOUND PCM20 FM RADIO RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/radio/radio-miropcm20*
+
 MODULE SUPPORT
 M:      Rusty Russell <rusty@rustcorp.com.au>
 S:      Maintained
@@ -5095,6 +5292,38 @@ L:	platform-driver-x86@vger.kernel.org
 S:      Supported
 F:      drivers/platform/x86/msi-wmi.c
 
+MT9M032 SENSOR DRIVER
+M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/i2c/mt9m032.c
+F:      include/media/mt9m032.h
+
+MT9P031 SENSOR DRIVER
+M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/i2c/mt9p031.c
+F:      include/media/mt9p031.h
+
+MT9T001 SENSOR DRIVER
+M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/i2c/mt9t001.c
+F:      include/media/mt9t001.h
+
+MT9V032 SENSOR DRIVER
+M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+S:      Maintained
+F:      drivers/media/i2c/mt9v032.c
+F:      include/media/mt9v032.h
+
 MULTIFUNCTION DEVICES (MFD)
 M:      Samuel Ortiz <sameo@linux.intel.com>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
@@ -5236,6 +5465,7 @@ F:	net/netrom/
 NETWORK BLOCK DEVICE (NBD)
 M:      Paul Clements <Paul.Clements@steeleye.com>
 S:      Maintained
+L:      nbd-general@lists.sourceforge.net
 F:      Documentation/blockdev/nbd.txt
 F:      drivers/block/nbd.c
 F:      include/linux/nbd.h
@@ -5369,13 +5599,6 @@ F:	include/linux/sunrpc/
 F:      include/uapi/linux/nfs*
 F:      include/uapi/linux/sunrpc/
 
-NI5010 NETWORK DRIVER
-M:      Jan-Pascal van Best <janpascal@vanbest.org>
-M:      Andreas Mohr <andi@lisas.de>
-L:      netdev@vger.kernel.org
-S:      Maintained
-F:      drivers/net/ethernet/racal/ni5010.*
-
 NILFS2 FILESYSTEM
 M:      KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
 L:      linux-nilfs@vger.kernel.org
@@ -5401,6 +5624,13 @@ S:	Maintained
 F:      Documentation/scsi/NinjaSCSI.txt
 F:      drivers/scsi/nsp32*
 
+NTB DRIVER
+M:      Jon Mason <jon.mason@intel.com>
+S:      Supported
+F:      drivers/ntb/
+F:      drivers/net/ntb_netdev.c
+F:      include/linux/ntb.h
+
 NTFS FILESYSTEM
 M:      Anton Altaparmakov <anton@tuxera.com>
 L:      linux-ntfs-dev@lists.sourceforge.net
@@ -5498,7 +5728,7 @@ S:	Maintained
 F:      drivers/mmc/host/omap.c
 
 OMAP HS MMC SUPPORT
-M:      Venkatraman S <svenkatr@ti.com>
+M:      Balaji T K <balajitk@ti.com>
 L:      linux-mmc@vger.kernel.org
 L:      linux-omap@vger.kernel.org
 S:      Maintained
@@ -5778,15 +6008,6 @@ L:	linux-i2c@vger.kernel.org
 S:      Maintained
 F:      drivers/i2c/muxes/i2c-mux-pca9541.c
 
-PCA9564/PCA9665 I2C BUS DRIVER
-M:      Wolfram Sang <w.sang@pengutronix.de>
-L:      linux-i2c@vger.kernel.org
-S:      Maintained
-F:      drivers/i2c/algos/i2c-algo-pca.c
-F:      drivers/i2c/busses/i2c-pca-*
-F:      include/linux/i2c-algo-pca.h
-F:      include/linux/i2c-pca-platform.h
-
 PCDP - PRIMARY CONSOLE AND DEBUG PORT
 M:      Khalid Aziz <khalid@gonehiking.org>
 S:      Maintained
@@ -6216,6 +6437,8 @@ F:	Documentation/networking/LICENSE.qla3xxx
 F:      drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
+M:      Rajesh Borundia <rajesh.borundia@qlogic.com>
+M:      Shahed Shaikh <shahed.shaikh@qlogic.com>
 M:      Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
 M:      Sony Chacko <sony.chacko@qlogic.com>
 M:      linux-driver@qlogic.com
@@ -6255,6 +6478,14 @@ L:	linux-hexagon@vger.kernel.org
 S:      Supported
 F:      arch/hexagon/
 
+QUICKCAM PARALLEL PORT WEBCAMS
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/parport/*-qcam*
+
 RADOS BLOCK DEVICE (RBD)
 M:      Yehuda Sadeh <yehuda@inktank.com>
 M:      Sage Weil <sage@inktank.com>
@@ -6312,6 +6543,12 @@ S:	Maintained
 F:      Documentation/blockdev/ramdisk.txt
 F:      drivers/block/brd.c
 
+RAMSAM DRIVER (IBM RamSan 70/80 PCI SSD Flash Card)
+M:      Joshua Morris <josh.h.morris@us.ibm.com>
+M:      Philip Kelleher <pjk1939@linux.vnet.ibm.com>
+S:      Maintained
+F:      drivers/block/rsxx/
+
 RANDOM NUMBER DRIVER
 M:      Theodore Ts'o" <tytso@mit.edu>
 S:      Maintained
@@ -6498,7 +6735,7 @@ S:	Supported
 F:      drivers/s390/net/
 
 S390 ZCRYPT DRIVER
-M:      Holger Dengler <hd@linux.vnet.ibm.com>
+M:      Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
@@ -6529,6 +6766,14 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Supported
 F:      drivers/mmc/host/s3cmci.*
 
+SAA6588 RDS RECEIVER DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/i2c/saa6588*
+
 SAA7134 VIDEO4LINUX DRIVER
 M:      Mauro Carvalho Chehab <mchehab@redhat.com>
 L:      linux-media@vger.kernel.org
@@ -6539,10 +6784,9 @@ F:	Documentation/video4linux/saa7134/
 F:      drivers/media/pci/saa7134/
 
 SAA7146 VIDEO4LINUX-2 DRIVER
-M:      Michael Hunold <michael@mihu.de>
+M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:      linux-media@vger.kernel.org
 T:      git git://linuxtv.org/media_tree.git
-W:      http://www.mihu.de/linux/saa7146
 S:      Maintained
 F:      drivers/media/common/saa7146/
 F:      drivers/media/pci/saa7146/
@@ -6584,6 +6828,13 @@ S:	Maintained
 F:      drivers/media/platform/s3c-camif/
 F:      include/media/s3c_camif.h
 
+SAMSUNG S5C73M3 CAMERA DRIVER
+M:      Kyungmin Park <kyungmin.park@samsung.com>
+M:      Andrzej Hajda <a.hajda@samsung.com>
+L:      linux-media@vger.kernel.org
+S:      Supported
+F:      drivers/media/i2c/s5c73m3/*
+
 SERIAL DRIVERS
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-serial@vger.kernel.org
@@ -6597,8 +6848,16 @@ F:	include/linux/dw_dmac.h
 F:      drivers/dma/dw_dmac_regs.h
 F:      drivers/dma/dw_dmac.c
 
+SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
+M:      Seungwon Jeon <tgih.jun@samsung.com>
+M:      Jaehoon Chung <jh80.chung@samsung.com>
+L:      linux-mmc@vger.kernel.org
+S:      Maintained
+F:      include/linux/mmc/dw_mmc.h
+F:      drivers/mmc/host/dw_mmc*
+
 TIMEKEEPING, NTP
-M:      John Stultz <johnstul@us.ibm.com>
+M:      John Stultz <john.stultz@linaro.org>
 M:      Thomas Gleixner <tglx@linutronix.de>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:      Supported
@@ -6820,7 +7079,8 @@ S:	Supported
 F:      drivers/net/ethernet/sfc/
 
 SGI GRU DRIVER
-M:      Jack Steiner <steiner@sgi.com>
+M:      Dimitri Sivanich <sivanich@sgi.com>
+M:      Robin Holt <holt@sgi.com>
 S:      Maintained
 F:      drivers/misc/sgi-gru/
 
@@ -6844,6 +7104,38 @@ M:	Robin Holt <holt@sgi.com>
 S:      Maintained
 F:      drivers/misc/sgi-xp/
 
+SI470X FM RADIO RECEIVER I2C DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/radio/si470x/radio-si470x-i2c.c
+
+SI470X FM RADIO RECEIVER USB DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/radio/si470x/radio-si470x-common.c
+F:      drivers/media/radio/si470x/radio-si470x.h
+F:      drivers/media/radio/si470x/radio-si470x-usb.c
+
+SH_VEU V4L2 MEM2MEM DRIVER
+M:      Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/platform/sh_veu.c
+F:      include/media/sh_veu.h
+
+SH_VOU V4L2 OUTPUT DRIVER
+M:      Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+L:      linux-media@vger.kernel.org
+S:      Maintained
+F:      drivers/media/platform/sh_vou.c
+F:      include/media/sh_vou.h
+
 SIMPLE FIRMWARE INTERFACE (SFI)
 M:      Len Brown <lenb@kernel.org>
 L:      sfi-devel@simplefirmware.org
@@ -7015,14 +7307,6 @@ L:	linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/smscufx.c
 
-SN-IA64 (Itanium) SUB-PLATFORM
-M:      Jes Sorensen <jes@sgi.com>
-L:      linux-altix@sgi.com
-L:      linux-ia64@vger.kernel.org
-W:      http://www.sgi.com/altix
-S:      Maintained
-F:      arch/ia64/sn/
-
 SOC-CAMERA V4L2 SUBSYSTEM
 M:      Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 L:      linux-media@vger.kernel.org
@@ -7178,6 +7462,7 @@ F:	drivers/clk/spear/
 
 SPI SUBSYSTEM
 M:      Grant Likely <grant.likely@secretlab.ca>
+M:      Mark Brown <broonie@opensource.wolfsonmicro.com>
 L:      spi-devel-general@lists.sourceforge.net
 Q:      http://patchwork.kernel.org/project/spi-devel-general/list/
 T:      git git://git.secretlab.ca/git/linux-2.6.git
@@ -7291,6 +7576,7 @@ STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
 M:      Julian Andres Klode <jak@jak-linux.org>
 M:      Marc Dietrich <marvin24@gmx.de>
 L:      ac100@lists.launchpad.net (moderated for non-subscribers)
+L:      linux-tegra@vger.kernel.org
 S:      Maintained
 F:      drivers/staging/nvec/
 
@@ -7303,8 +7589,7 @@ S:	Odd Fixes
 F:      drivers/staging/olpc_dcon/
 
 STAGING - OZMO DEVICES USB OVER WIFI DRIVER
-M:      Rupesh Gujare <rgujare@ozmodevices.com>
-M:      Chris Kelly <ckelly@ozmodevices.com>
+M:      Rupesh Gujare <rupesh.gujare@atmel.com>
 S:      Maintained
 F:      drivers/staging/ozwpan/
 
@@ -7418,6 +7703,12 @@ F:	lib/swiotlb.c
 F:      arch/*/kernel/pci-swiotlb.c
 F:      include/linux/swiotlb.h
 
+SYNOPSYS ARC ARCHITECTURE
+M:      Vineet Gupta <vgupta@synopsys.com>
+L:      linux-snps-arc@vger.kernel.org
+S:      Supported
+F:      arch/arc/
+
 SYSV FILESYSTEM
 M:      Christoph Hellwig <hch@infradead.org>
 S:      Maintained
@@ -7519,6 +7810,14 @@ T:	git git://linuxtv.org/mkrufky/tuners.git
 S:      Maintained
 F:      drivers/media/tuners/tda8290.*
 
+TDA9840 MEDIA DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/i2c/tda9840*
+
 TEA5761 TUNER DRIVER
 M:      Mauro Carvalho Chehab <mchehab@redhat.com>
 L:      linux-media@vger.kernel.org
@@ -7535,14 +7834,35 @@ T:	git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      drivers/media/tuners/tea5767.*
 
+TEA6415C MEDIA DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/i2c/tea6415c*
+
+TEA6420 MEDIA DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/i2c/tea6420*
+
 TEAM DRIVER
-M:      Jiri Pirko <jpirko@redhat.com>
+M:      Jiri Pirko <jiri@resnulli.us>
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/team/
 F:      include/linux/if_team.h
 F:      include/uapi/linux/if_team.h
 
+TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
+M:      Savoir-faire Linux Inc. <kernel@savoirfairelinux.com>
+S:      Maintained
+F:      arch/x86/platform/ts5500/
+
 TECHNOTREND USB IR RECEIVER
 M:      Sean Young <sean@mess.org>
 L:      linux-media@vger.kernel.org
@@ -7555,9 +7875,7 @@ L:	linux-tegra@vger.kernel.org
 Q:      http://patchwork.ozlabs.org/project/linux-tegra/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
 S:      Supported
-F:      arch/arm/mach-tegra
-F:      arch/arm/boot/dts/tegra*
-F:      arch/arm/configs/tegra_defconfig
+K:      (?i)[^a-z]tegra
 
 TEHUTI ETHERNET DRIVER
 M:      Andy Gospodarek <andy@greyhouse.net>
@@ -7585,6 +7903,11 @@ S:      Supported
 F:      drivers/thermal/
 F:      include/linux/thermal.h
 
+THINGM BLINK(1) USB RGB LED DRIVER
+M:      Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+S:      Maintained
+F:      drivers/hid/hid-thingm.c
+
 THINKPAD ACPI EXTRAS DRIVER
 M:      Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
 L:      ibm-acpi-devel@lists.sourceforge.net
@@ -7617,6 +7940,22 @@ F:	Documentation/backlight/lp855x-driver.txt
 F:      drivers/video/backlight/lp855x_bl.c
 F:      include/linux/platform_data/lp855x.h
 
+TI LP8727 CHARGER DRIVER
+M:      Milo Kim <milo.kim@ti.com>
+S:      Maintained
+F:      drivers/power/lp8727_charger.c
+F:      include/linux/platform_data/lp8727.h
+
+TI LP8788 MFD DRIVER
+M:      Milo Kim <milo.kim@ti.com>
+S:      Maintained
+F:      drivers/iio/adc/lp8788_adc.c
+F:      drivers/leds/leds-lp8788.c
+F:      drivers/mfd/lp8788*.c
+F:      drivers/power/lp8788-charger.c
+F:      drivers/regulator/lp8788-*.c
+F:      include/linux/mfd/lp8788*.h
+
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:      Peter Ujfalusi <peter.ujfalusi@ti.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -7911,9 +8250,10 @@ F:	drivers/net/wireless/ath/ar5523/
 USB ATTACHED SCSI
 M:      Matthew Wilcox <willy@linux.intel.com>
 M:      Sarah Sharp <sarah.a.sharp@linux.intel.com>
+M:      Gerd Hoffmann <kraxel@redhat.com>
 L:      linux-usb@vger.kernel.org
 L:      linux-scsi@vger.kernel.org
-S:      Supported
+S:      Maintained
 F:      drivers/usb/storage/uas.c
 
 USB CDC ETHERNET DRIVER
@@ -8157,6 +8497,14 @@ S:	Maintained
 F:      drivers/media/usb/uvc/
 F:      include/uapi/linux/uvcvideo.h
 
+USB VISION DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Odd Fixes
+F:      drivers/media/usb/usbvision/
+
 USB WEBCAM GADGET
 M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:      linux-usb@vger.kernel.org
@@ -8306,6 +8654,14 @@ L:	netdev@vger.kernel.org
 S:      Maintained
 F:      drivers/net/ethernet/via/via-velocity.*
 
+VIVI VIRTUAL VIDEO DRIVER
+M:      Hans Verkuil <hverkuil@xs4all.nl>
+L:      linux-media@vger.kernel.org
+T:      git git://linuxtv.org/media_tree.git
+W:      http://linuxtv.org
+S:      Maintained
+F:      drivers/media/platform/vivi*
+
 VLAN (802.1Q)
 M:      Patrick McHardy <kaber@trash.net>
 L:      netdev@vger.kernel.org