Merge tag 'iio-for-3.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7f51a345ed8ec755e8cdd2616d8bf650dab30076..e8ee569fdce5b77eef43d131bbf468706bee9e61 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -580,12 +580,24 @@ L:        linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/i2c/ad9389b*
 
+ANALOG DEVICES INC ADV7511 DRIVER
+M:     Hans Verkuil <hans.verkuil@cisco.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/adv7511*
+
 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 ADV7842 DRIVER
+M:     Hans Verkuil <hans.verkuil@cisco.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/adv7842*
+
 ANALOG DEVICES INC ASOC CODEC DRIVERS
 M:     Lars-Peter Clausen <lars@metafoo.de>
 L:     device-drivers-devel@blackfin.uclinux.org
@@ -595,6 +607,7 @@ S:  Supported
 F:     sound/soc/codecs/adau*
 F:     sound/soc/codecs/adav*
 F:     sound/soc/codecs/ad1*
+F:     sound/soc/codecs/ad7*
 F:     sound/soc/codecs/ssm*
 F:     sound/soc/codecs/sigmadsp.*
 
@@ -638,6 +651,12 @@ S: Maintained
 F:     drivers/net/appletalk/
 F:     net/appletalk/
 
+APTINA CAMERA SENSOR PLL
+M:     Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/i2c/aptina-pll.*
+
 ARASAN COMPACT FLASH PATA CONTROLLER
 M:     Viresh Kumar <viresh.linux@gmail.com>
 L:     linux-ide@vger.kernel.org
@@ -813,7 +832,7 @@ F:  arch/arm/mach-prima2/
 F:     drivers/dma/sirf-dma.c
 F:     drivers/i2c/busses/i2c-sirf.c
 F:     drivers/mmc/host/sdhci-sirf.c
-F:     drivers/pinctrl/pinctrl-sirf.c
+F:     drivers/pinctrl/sirf/
 F:     drivers/spi/spi-sirf.c
 
 ARM/EBSA110 MACHINE SUPPORT
@@ -914,24 +933,24 @@ F:        arch/arm/mach-pxa/colibri-pxa270-income.c
 
 ARM/INTEL IOP32X ARM ARCHITECTURE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-M:     Dan Williams <djbw@fb.com>
+M:     Dan Williams <dan.j.williams@intel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/INTEL IOP33X ARM ARCHITECTURE
-M:     Dan Williams <djbw@fb.com>
+M:     Dan Williams <dan.j.williams@intel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/INTEL IOP13XX ARM ARCHITECTURE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-M:     Dan Williams <djbw@fb.com>
+M:     Dan Williams <dan.j.williams@intel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
 ARM/INTEL IQ81342EX MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-M:     Dan Williams <djbw@fb.com>
+M:     Dan Williams <dan.j.williams@intel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
@@ -956,7 +975,7 @@ F:  drivers/pcmcia/pxa2xx_stargate2.c
 
 ARM/INTEL XSC3 (MANZANO) ARM CORE
 M:     Lennert Buytenhek <kernel@wantstofly.org>
-M:     Dan Williams <djbw@fb.com>
+M:     Dan Williams <dan.j.williams@intel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
@@ -1009,7 +1028,7 @@ F:        arch/arm/mach-orion5x/ts78xx-*
 ARM/MICREL KS8695 ARCHITECTURE
 M:     Greg Ungerer <gerg@uclinux.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-F:     arch/arm/mach-ks8695
+F:     arch/arm/mach-ks8695/
 S:     Odd Fixes
 
 ARM/MIOA701 MACHINE SUPPORT
@@ -1029,7 +1048,6 @@ M:        STEricsson <STEricsson_nomadik_linux@list.st.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-nomadik/
-F:     arch/arm/plat-nomadik/
 F:     drivers/i2c/busses/i2c-nomadik.c
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
 
@@ -1051,7 +1069,7 @@ F:        drivers/mmc/host/msm_sdcc.h
 F:     drivers/tty/serial/msm_serial.h
 F:     drivers/tty/serial/msm_serial.c
 F:     drivers/*/pm8???-*
-F:     drivers/ssbi/
+F:     drivers/mfd/ssbi/
 F:     include/linux/mfd/pm8xxx/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
 S:     Maintained
@@ -1137,7 +1155,6 @@ L:        linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 W:     http://www.fluff.org/ben/linux/
 S:     Maintained
 F:     arch/arm/plat-samsung/
-F:     arch/arm/plat-s3c24xx/
 F:     arch/arm/mach-s3c24*/
 F:     arch/arm/mach-s3c64xx/
 F:     drivers/*/*s3c2410*
@@ -1160,8 +1177,6 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-s5pv210/mach-aquila.c
 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>
@@ -1301,13 +1316,12 @@ 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/i2c/busses/i2c-wmt.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/ehci-platform.c
 F:     drivers/usb/host/uhci-platform.c
 F:     drivers/video/vt8500lcdfb.*
 F:     drivers/video/wm8505fb*
@@ -1368,7 +1382,7 @@ F:        drivers/platform/x86/asus*.c
 F:     drivers/platform/x86/eeepc*.c
 
 ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
-M:     Dan Williams <djbw@fb.com>
+M:     Dan Williams <dan.j.williams@intel.com>
 W:     http://sourceforge.net/projects/xscaleiop
 S:     Maintained
 F:     Documentation/crypto/async-tx-api.txt
@@ -1547,6 +1561,13 @@ W:       http://atmelwlandriver.sourceforge.net/
 S:     Maintained
 F:     drivers/net/wireless/atmel*
 
+ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
+M:      Bradley Grove <linuxdrivers@attotech.com>
+L:      linux-scsi@vger.kernel.org
+W:      http://www.attotech.com
+S:      Supported
+F:      drivers/scsi/esas2r
+
 AUDIT SUBSYSTEM
 M:     Al Viro <viro@zeniv.linux.org.uk>
 M:     Eric Paris <eparis@redhat.com>
@@ -1790,6 +1811,17 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2x/
 
+BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
+M:     Christian Daudt <csd@broadcom.com>
+T:     git git://git.github.com/broadcom/bcm11351
+S:     Maintained
+F:     arch/arm/mach-bcm/
+F:     arch/arm/boot/dts/bcm113*
+F:     arch/arm/boot/dts/bcm281*
+F:     arch/arm/configs/bcm_defconfig
+F:     drivers/mmc/host/sdhci_bcm_kona.c
+F:     drivers/clocksource/bcm_kona_timer.c
+
 BROADCOM BCM2835 ARM ARCHICTURE
 M:     Stephen Warren <swarren@wwwdotorg.org>
 L:     linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1823,6 +1855,12 @@ L:       linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/bnx2fc/
 
+BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
+M:     Eddie Wai <eddie.wai@broadcom.com>
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/bnx2i/
+
 BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 M:     Rafał Miłecki <zajec5@gmail.com>
 L:     linux-wireless@vger.kernel.org
@@ -2004,10 +2042,10 @@ W:      http://ceph.com/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git
 S:     Supported
 F:     Documentation/filesystems/ceph.txt
-F:     fs/ceph
-F:     net/ceph
-F:     include/linux/ceph
-F:     include/linux/crush
+F:     fs/ceph/
+F:     net/ceph/
+F:     include/linux/ceph/
+F:     include/linux/crush/
 
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 L:     linux-usb@vger.kernel.org
@@ -2076,7 +2114,8 @@ F:        drivers/usb/chipidea/
 
 CISCO VIC ETHERNET NIC DRIVER
 M:     Christian Benvenuti <benve@cisco.com>
-M:     Roopa Prabhu <roprabhu@cisco.com>
+M:     Sujith Sankar <ssujith@cisco.com>
+M:     Govindarajulu Varadarajan <govindarajulu90@gmail.com>
 M:     Neel Patel <neepatel@cisco.com>
 M:     Nishank Trivedi <nistrive@cisco.com>
 S:     Supported
@@ -2112,6 +2151,13 @@ M:       Russell King <linux@arm.linux.org.uk>
 S:     Maintained
 F:     include/linux/clk.h
 
+CLOCKSOURCE, CLOCKEVENT DRIVERS
+M:     Daniel Lezcano <daniel.lezcano@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
+F:     drivers/clocksource
+
 CISCO FCOE HBA DRIVER
 M:     Hiral Patel <hiralpat@cisco.com>
 M:     Suma Ramars <sramars@cisco.com>
@@ -2268,6 +2314,15 @@ F:       drivers/cpufreq/arm_big_little.h
 F:     drivers/cpufreq/arm_big_little.c
 F:     drivers/cpufreq/arm_big_little_dt.c
 
+CPUIDLE DRIVER - ARM BIG LITTLE
+M:      Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+M:      Daniel Lezcano <daniel.lezcano@linaro.org>
+L:      linux-pm@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org
+T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
+S:      Maintained
+F:      drivers/cpuidle/cpuidle-big_little.c
+
 CPUIDLE DRIVERS
 M:     Rafael J. Wysocki <rjw@sisk.pl>
 M:     Daniel Lezcano <daniel.lezcano@linaro.org>
@@ -2287,7 +2342,7 @@ CPU POWER MONITORING SUBSYSTEM
 M:     Dominik Brodowski <linux@dominikbrodowski.net>
 M:     Thomas Renninger <trenn@suse.de>
 S:     Maintained
-F:     tools/power/cpupower
+F:     tools/power/cpupower/
 
 CPUSETS
 M:     Li Zefan <lizefan@huawei.com>
@@ -2454,9 +2509,9 @@ S:        Maintained
 F:     drivers/media/common/cypress_firmware*
 
 CYTTSP TOUCHSCREEN DRIVER
-M:     Javier Martinez Canillas <javier@dowhile0.org>
+M:     Ferruh Yigit <fery@cypress.com>
 L:     linux-input@vger.kernel.org
-S:     Maintained
+S:     Supported
 F:     drivers/input/touchscreen/cyttsp*
 F:     include/linux/input/cyttsp.h
 
@@ -2643,7 +2698,7 @@ T:        git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
 
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 M:     Vinod Koul <vinod.koul@intel.com>
-M:     Dan Williams <djbw@fb.com>
+M:     Dan Williams <dan.j.williams@intel.com>
 S:     Supported
 F:     drivers/dma/
 F:     include/linux/dma*
@@ -2725,7 +2780,7 @@ L:        intel-gfx@lists.freedesktop.org
 L:     dri-devel@lists.freedesktop.org
 T:     git git://people.freedesktop.org/~danvet/drm-intel
 S:     Supported
-F:     drivers/gpu/drm/i915
+F:     drivers/gpu/drm/i915/
 F:     include/drm/i915*
 F:     include/uapi/drm/i915*
 
@@ -2737,7 +2792,7 @@ M:        Kyungmin Park <kyungmin.park@samsung.com>
 L:     dri-devel@lists.freedesktop.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
 S:     Supported
-F:     drivers/gpu/drm/exynos
+F:     drivers/gpu/drm/exynos/
 F:     include/drm/exynos*
 F:     include/uapi/drm/exynos*
 
@@ -2990,7 +3045,7 @@ M:        Mauro Carvalho Chehab <m.chehab@samsung.com>
 L:     linux-edac@vger.kernel.org
 W:     bluesmoke.sourceforge.net
 S:     Maintained
-F:     drivers/edac/ghes-edac.c
+F:     drivers/edac/ghes_edac.c
 
 EDAC-I82443BXGX
 M:     Tim Small <tim@buttersideup.com>
@@ -3596,8 +3651,8 @@ M:        Arnd Bergmann <arnd@arndb.de>
 L:     linux-arch@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
 S:     Maintained
-F:     include/asm-generic
-F:     include/uapi/asm-generic
+F:     include/asm-generic/
+F:     include/uapi/asm-generic/
 
 GENERIC UIO DRIVER FOR PCI DEVICES
 M:     "Michael S. Tsirkin" <mst@redhat.com>
@@ -3639,7 +3694,8 @@ GRE DEMULTIPLEXER DRIVER
 M:     Dmitry Kozlov <xeb@mail.ru>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     net/ipv4/gre.c
+F:     net/ipv4/gre_demux.c
+F:     net/ipv4/gre_offload.c
 F:     include/net/gre.h
 
 GRETH 10/100/1G Ethernet MAC device driver
@@ -3717,7 +3773,7 @@ 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/hdpvr
+F:     drivers/media/usb/hdpvr/
 
 HWPOISON MEMORY FAILURE HANDLING
 M:     Andi Kleen <andi@firstfloor.org>
@@ -4101,6 +4157,13 @@ W:       http://launchpad.net/ideapad-laptop
 S:     Maintained
 F:     drivers/platform/x86/ideapad-laptop.c
 
+IDEAPAD LAPTOP SLIDEBAR DRIVER
+M:     Andrey Moiseev <o2g.org.ru@gmail.com>
+L:     linux-input@vger.kernel.org
+W:     https://github.com/o2genum/ideapad-slidebar
+S:     Maintained
+F:     drivers/input/misc/ideapad_slidebar.c
+
 IDE/ATAPI DRIVERS
 M:     Borislav Petkov <bp@alien8.de>
 L:     linux-ide@vger.kernel.org
@@ -4268,7 +4331,7 @@ F:        arch/x86/kernel/microcode_core.c
 F:     arch/x86/kernel/microcode_intel.c
 
 INTEL I/OAT DMA DRIVER
-M:     Dan Williams <djbw@fb.com>
+M:     Dan Williams <dan.j.williams@intel.com>
 S:     Maintained
 F:     drivers/dma/ioat*
 
@@ -4281,7 +4344,7 @@ F:        drivers/iommu/intel-iommu.c
 F:     include/linux/intel-iommu.h
 
 INTEL IOP-ADMA DMA DRIVER
-M:     Dan Williams <djbw@fb.com>
+M:     Dan Williams <dan.j.williams@intel.com>
 S:     Odd fixes
 F:     drivers/dma/iop-adma.c
 
@@ -4300,7 +4363,7 @@ M:        Deepak Saxena <dsaxena@plexity.net>
 S:     Maintained
 F:     drivers/char/hw_random/ixp4xx-rng.c
 
-INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
+INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e)
 M:     Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 M:     Jesse Brandeburg <jesse.brandeburg@intel.com>
 M:     Bruce Allan <bruce.w.allan@intel.com>
@@ -4325,6 +4388,7 @@ F:        Documentation/networking/igbvf.txt
 F:     Documentation/networking/ixgb.txt
 F:     Documentation/networking/ixgbe.txt
 F:     Documentation/networking/ixgbevf.txt
+F:     Documentation/networking/i40e.txt
 F:     drivers/net/ethernet/intel/
 
 INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT
@@ -4365,7 +4429,7 @@ F:        drivers/net/wireless/iwlegacy/
 
 INTEL WIRELESS WIFI LINK (iwlwifi)
 M:     Johannes Berg <johannes.berg@intel.com>
-M:     Wey-Yi Guy <wey-yi.w.guy@intel.com>
+M:     Emmanuel Grumbach <emmanuel.grumbach@intel.com>
 M:     Intel Linux Wireless <ilw@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://intellinuxwireless.org
@@ -4518,7 +4582,7 @@ S:        Supported
 W:     http://www.openfabrics.org
 W:     www.open-iscsi.org
 Q:     http://patchwork.kernel.org/project/linux-rdma/list/
-F:     drivers/infiniband/ulp/iser
+F:     drivers/infiniband/ulp/iser/
 
 ISDN SUBSYSTEM
 M:     Karsten Keil <isdn@linux-pingi.de>
@@ -4572,7 +4636,7 @@ W:        http://palosaari.fi/linux/
 Q:     http://patchwork.linuxtv.org/project/linux-media/list/
 T:     git git://linuxtv.org/anttip/media_tree.git
 S:     Maintained
-F:     drivers/media/tuners/it913x*
+F:     drivers/media/tuners/tuner_it913x*
 
 IVTV VIDEO4LINUX DRIVER
 M:     Andy Walls <awalls@md.metrocast.net>
@@ -5396,6 +5460,7 @@ F:        drivers/watchdog/mena21_wdt.c
 
 METAG ARCHITECTURE
 M:     James Hogan <james.hogan@imgtec.com>
+L:     linux-metag@vger.kernel.org
 S:     Supported
 F:     arch/metag/
 F:     Documentation/metag/
@@ -5497,7 +5562,7 @@ L:        platform-driver-x86@vger.kernel.org
 S:     Supported
 F:     drivers/platform/x86/msi-wmi.c
 
-MT9M032 SENSOR DRIVER
+MT9M032 APTINA SENSOR DRIVER
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -5505,7 +5570,7 @@ S:        Maintained
 F:     drivers/media/i2c/mt9m032.c
 F:     include/media/mt9m032.h
 
-MT9P031 SENSOR DRIVER
+MT9P031 APTINA CAMERA SENSOR
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -5513,7 +5578,7 @@ S:        Maintained
 F:     drivers/media/i2c/mt9p031.c
 F:     include/media/mt9p031.h
 
-MT9T001 SENSOR DRIVER
+MT9T001 APTINA CAMERA SENSOR
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -5521,7 +5586,7 @@ S:        Maintained
 F:     drivers/media/i2c/mt9t001.c
 F:     include/media/mt9t001.h
 
-MT9V032 SENSOR DRIVER
+MT9V032 APTINA CAMERA SENSOR
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 T:     git git://linuxtv.org/media_tree.git
@@ -5581,9 +5646,9 @@ S:        Maintained
 F:     drivers/media/tuners/mxl5007t.*
 
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
-M:     Andrew Gallatin <gallatin@myri.com>
+M:     Hyong-Youb Kim <hykim@myri.com>
 L:     netdev@vger.kernel.org
-W:     http://www.myri.com/scs/download-Myri10GE.html
+W:     https://www.myricom.com/support/downloads/myri10ge.html
 S:     Supported
 F:     drivers/net/ethernet/myricom/myri10ge/
 
@@ -5792,7 +5857,7 @@ M:        Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
 M:     Samuel Ortiz <sameo@linux.intel.com>
 L:     linux-wireless@vger.kernel.org
 L:     linux-nfc@lists.01.org (moderated for non-subscribers)
-S:     Maintained
+S:     Supported
 F:     net/nfc/
 F:     include/net/nfc/
 F:     include/uapi/linux/nfc.h
@@ -5843,6 +5908,8 @@ F:        drivers/scsi/nsp32*
 NTB DRIVER
 M:     Jon Mason <jon.mason@intel.com>
 S:     Supported
+W:     https://github.com/jonmason/ntb/wiki
+T:     git git://github.com/jonmason/ntb.git
 F:     drivers/ntb/
 F:     drivers/net/ntb_netdev.c
 F:     include/linux/ntb.h
@@ -5884,7 +5951,7 @@ F:        drivers/i2c/busses/i2c-omap.c
 F:     include/linux/i2c-omap.h
 
 OMAP DEVICE TREE SUPPORT
-M:     Benoît Cousson <b-cousson@ti.com>
+M:     Benoît Cousson <bcousson@baylibre.com>
 M:     Tony Lindgren <tony@atomide.com>
 L:     linux-omap@vger.kernel.org
 L:     devicetree@vger.kernel.org
@@ -5905,15 +5972,12 @@ S:      Maintained
 F:     arch/arm/*omap*/*pm*
 F:     drivers/cpufreq/omap-cpufreq.c
 
-OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT
+OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT
 M:     Rajendra Nayak <rnayak@ti.com>
 M:     Paul Walmsley <paul@pwsan.com>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
-F:     arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
-F:     arch/arm/mach-omap2/powerdomain44xx.c
-F:     arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
-F:     arch/arm/mach-omap2/clockdomain44xx.c
+F:     arch/arm/mach-omap2/prm*
 
 OMAP AUDIO SUPPORT
 M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
@@ -5964,14 +6028,14 @@ S:      Maintained
 F:     drivers/char/hw_random/omap-rng.c
 
 OMAP HWMOD SUPPORT
-M:     Benoît Cousson <b-cousson@ti.com>
+M:     Benoît Cousson <bcousson@baylibre.com>
 M:     Paul Walmsley <paul@pwsan.com>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
 F:     arch/arm/mach-omap2/omap_hwmod.*
 
 OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
-M:     Benoît Cousson <b-cousson@ti.com>
+M:     Benoît Cousson <bcousson@baylibre.com>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
 F:     arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -6066,7 +6130,7 @@ M:        Rob Herring <rob.herring@calxeda.com>
 M:     Pawel Moll <pawel.moll@arm.com>
 M:     Mark Rutland <mark.rutland@arm.com>
 M:     Stephen Warren <swarren@wwwdotorg.org>
-M:     Ian Campbell <ian.campbell@citrix.com>
+M:     Ian Campbell <ijc+devicetree@hellion.org.uk>
 L:     devicetree@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/
@@ -6079,7 +6143,7 @@ W:        http://openrisc.net
 L:     linux@lists.openrisc.net (moderated for non-subscribers)
 S:     Maintained
 T:     git git://openrisc.net/~jonas/linux
-F:     arch/openrisc
+F:     arch/openrisc/
 
 OPENVSWITCH
 M:     Jesse Gross <jesse@nicira.com>
@@ -6275,6 +6339,13 @@ F:       Documentation/PCI/
 F:     drivers/pci/
 F:     include/linux/pci*
 
+PCI DRIVER FOR NVIDIA TEGRA
+M:     Thierry Reding <thierry.reding@gmail.com>
+L:     linux-tegra@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
+F:     drivers/pci/host/pci-tegra.c
+
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     linux-pcmcia@lists.infradead.org
@@ -6363,7 +6434,7 @@ M:        Jamie Iles <jamie@jamieiles.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://github.com/jamieiles/linux-2.6-ji.git
 S:     Supported
-F:     arch/arm/mach-picoxcell
+F:     arch/arm/mach-picoxcell/
 F:     drivers/*/picoxcell*
 F:     drivers/*/*/picoxcell*
 
@@ -6636,7 +6707,7 @@ F:        drivers/spi/spi-pxa2xx*
 F:     drivers/usb/gadget/pxa2*
 F:     include/sound/pxa2xx-lib.h
 F:     sound/arm/pxa*
-F:     sound/soc/pxa
+F:     sound/soc/pxa/
 
 MMP SUPPORT
 M:     Eric Miao <eric.y.miao@gmail.com>
@@ -6676,11 +6747,11 @@ F:      Documentation/scsi/LICENSE.qla2xxx
 F:     drivers/scsi/qla2xxx/
 
 QLOGIC QLA4XXX iSCSI DRIVER
-M:     Ravi Anand <ravi.anand@qlogic.com>
 M:     Vikas Chaudhary <vikas.chaudhary@qlogic.com>
 M:     iscsi-driver@qlogic.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
+F:     Documentation/scsi/LICENSE.qla4xxx
 F:     drivers/scsi/qla4xxx/
 
 QLOGIC QLA3XXX NETWORK DRIVER
@@ -6921,6 +6992,14 @@ M:       Maxim Levitsky <maximlevitsky@gmail.com>
 S:     Maintained
 F:     drivers/memstick/host/r592.*
 
+ROCCAT DRIVERS
+M:     Stefan Achatz <erazor_de@users.sourceforge.net>
+W:     http://sourceforge.net/projects/roccat/
+S:     Maintained
+F:     drivers/hid/hid-roccat*
+F:     include/linux/hid-roccat*
+F:     Documentation/ABI/*/sysfs-driver-hid-roccat*
+
 ROCKETPORT DRIVER
 P:     Comtrol Corp.
 W:     http://www.comtrol.com
@@ -7081,7 +7160,7 @@ SAMSUNG AUDIO (ASoC) DRIVERS
 M:     Sangbeom Kim <sbkim73@samsung.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Supported
-F:     sound/soc/samsung
+F:     sound/soc/samsung/
 
 SAMSUNG FRAMEBUFFER DRIVER
 M:     Jingoo Han <jg1.han@samsung.com>
@@ -7127,10 +7206,11 @@ SERIAL DRIVERS
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     linux-serial@vger.kernel.org
 S:     Maintained
-F:     drivers/tty/serial
+F:     drivers/tty/serial/
 
 SYNOPSYS DESIGNWARE DMAC DRIVER
 M:     Viresh Kumar <viresh.linux@gmail.com>
+M:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 S:     Maintained
 F:     include/linux/dw_dmac.h
 F:     drivers/dma/dw/
@@ -7143,7 +7223,7 @@ S:        Maintained
 F:     include/linux/mmc/dw_mmc.h
 F:     drivers/mmc/host/dw_mmc*
 
-TIMEKEEPING, NTP
+TIMEKEEPING, CLOCKSOURCE CORE, NTP
 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
@@ -7156,13 +7236,12 @@ F:      include/uapi/linux/timex.h
 F:     kernel/time/clocksource.c
 F:     kernel/time/time*.c
 F:     kernel/time/ntp.c
-F:     drivers/clocksource
 
 TLG2300 VIDEO4LINUX-2 DRIVER
 M:     Huang Shijie <shijie8@gmail.com>
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 S:     Odd Fixes
-F:     drivers/media/usb/tlg2300
+F:     drivers/media/usb/tlg2300/
 
 SC1200 WDT DRIVER
 M:     Zwane Mwaikambo <zwane@arm.linux.org.uk>
@@ -7236,6 +7315,7 @@ W:        http://lksctp.sourceforge.net
 S:     Maintained
 F:     Documentation/networking/sctp.txt
 F:     include/linux/sctp.h
+F:     include/uapi/linux/sctp.h
 F:     include/net/sctp/
 F:     net/sctp/
 
@@ -7366,7 +7446,6 @@ F:        drivers/net/ethernet/sfc/
 
 SGI GRU DRIVER
 M:     Dimitri Sivanich <sivanich@sgi.com>
-M:     Robin Holt <holt@sgi.com>
 S:     Maintained
 F:     drivers/misc/sgi-gru/
 
@@ -7386,7 +7465,8 @@ S:        Maintained for 2.6.
 F:     Documentation/sgi-visws.txt
 
 SGI XP/XPC/XPNET DRIVER
-M:     Robin Holt <holt@sgi.com>
+M:     Cliff Whickman <cpw@sgi.com>
+M:     Robin Holt <robinmholt@gmail.com>
 S:     Maintained
 F:     drivers/misc/sgi-xp/
 
@@ -7422,7 +7502,7 @@ 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-si4713.h
+F:     drivers/media/radio/radio-si4713.c
 
 SIANO DVB DRIVER
 M:     Mauro Carvalho Chehab <m.chehab@samsung.com>
@@ -7431,9 +7511,9 @@ W:        http://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 S:     Odd fixes
 F:     drivers/media/common/siano/
-F:     drivers/media/dvb/siano/
 F:     drivers/media/usb/siano/
-F:     drivers/media/mmc/siano
+F:     drivers/media/usb/siano/
+F:     drivers/media/mmc/siano/
 
 SH_VEU V4L2 MEM2MEM DRIVER
 M:     Guennadi Liakhovetski <g.liakhovetski@gmx.de>
@@ -7471,9 +7551,9 @@ 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/mach-bast.c
-F:     arch/arm/mach-s3c2410/bast-ide.c
-F:     arch/arm/mach-s3c2410/bast-irq.c
+F:     arch/arm/mach-s3c24xx/mach-bast.c
+F:     arch/arm/mach-s3c24xx/bast-ide.c
+F:     arch/arm/mach-s3c24xx/bast-irq.c
 
 TI DAVINCI MACHINE SUPPORT
 M:     Sekhar Nori <nsekhar@ti.com>
@@ -7482,7 +7562,7 @@ L:        davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers
 T:     git git://gitorious.org/linux-davinci/linux-davinci.git
 Q:     http://patchwork.kernel.org/project/linux-davinci/list/
 S:     Supported
-F:     arch/arm/mach-davinci
+F:     arch/arm/mach-davinci/
 F:     drivers/i2c/busses/i2c-davinci.c
 
 TI DAVINCI SERIES MEDIA DRIVER
@@ -7550,6 +7630,14 @@ S:       Maintained
 F:     Documentation/security/Smack.txt
 F:     security/smack/
 
+SMARTREFLEX DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
+M:     Kevin Hilman <khilman@kernel.org>
+M:     Nishanth Menon <nm@ti.com>
+S:     Maintained
+F:     drivers/power/avs/smartreflex.c
+F:     include/linux/power/smartreflex.h
+L:     linux-pm@vger.kernel.org
+
 SMC91x ETHERNET DRIVER
 M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Odd Fixes
@@ -7559,7 +7647,7 @@ SMIA AND SMIA++ IMAGE SENSOR DRIVER
 M:     Sakari Ailus <sakari.ailus@iki.fi>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/media/i2c/smiapp
+F:     drivers/media/i2c/smiapp/
 F:     include/media/smiapp.h
 F:     drivers/media/i2c/smiapp-pll.c
 F:     drivers/media/i2c/smiapp-pll.h
@@ -7662,6 +7750,11 @@ W:       http://tifmxx.berlios.de/
 S:     Maintained
 F:     drivers/memstick/host/tifm_ms.c
 
+SONY MEMORYSTICK STANDARD SUPPORT
+M:     Maxim Levitsky <maximlevitsky@gmail.com>
+S:     Maintained
+F:     drivers/memstick/core/ms_block.*
+
 SOUND
 M:     Jaroslav Kysela <perex@perex.cz>
 M:     Takashi Iwai <tiwai@suse.de>
@@ -7675,6 +7768,17 @@ F:       include/sound/
 F:     include/uapi/sound/
 F:     sound/
 
+SOUND - COMPRESSED AUDIO
+M:     Vinod Koul <vinod.koul@intel.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
+S:     Supported
+F:     Documentation/sound/alsa/compress_offload.txt
+F:     include/sound/compress_driver.h
+F:     include/uapi/sound/compress_*
+F:     sound/core/compress_offload.c
+F:     sound/soc/soc-compress.c
+
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
 M:     Liam Girdwood <lgirdwood@gmail.com>
 M:     Mark Brown <broonie@kernel.org>
@@ -7682,6 +7786,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:     http://alsa-project.org/main/index.php/ASoC
 S:     Supported
+F:     Documentation/sound/alsa/soc/
 F:     sound/soc/
 F:     include/sound/soc*
 
@@ -7726,35 +7831,7 @@ L:       spear-devel@list.st.com
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.st.com/spear
 S:     Maintained
-F:     arch/arm/plat-spear/
-
-SPEAR13XX MACHINE SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
-M:     Shiraz Hashim <shiraz.hashim@st.com>
-L:     spear-devel@list.st.com
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:     http://www.st.com/spear
-S:     Maintained
-F:     arch/arm/mach-spear13xx/
-
-SPEAR3XX MACHINE SUPPORT
-M:     Viresh Kumar <viresh.linux@gmail.com>
-M:     Shiraz Hashim <shiraz.hashim@st.com>
-L:     spear-devel@list.st.com
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:     http://www.st.com/spear
-S:     Maintained
-F:     arch/arm/mach-spear3xx/
-
-SPEAR6XX MACHINE SUPPORT
-M:     Rajeev Kumar <rajeev-dlh.kumar@st.com>
-M:     Shiraz Hashim <shiraz.hashim@st.com>
-M:     Viresh Kumar <viresh.linux@gmail.com>
-L:     spear-devel@list.st.com
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-W:     http://www.st.com/spear
-S:     Maintained
-F:     arch/arm/mach-spear6xx/
+F:     arch/arm/mach-spear/
 
 SPEAR CLOCK FRAMEWORK SUPPORT
 M:     Viresh Kumar <viresh.linux@gmail.com>
@@ -7972,6 +8049,12 @@ F:       arch/m68k/sun3*/
 F:     arch/m68k/include/asm/sun3*
 F:     drivers/net/ethernet/i825xx/sun3*
 
+SUNDANCE NETWORK DRIVER
+M:     Denis Kirjanov <kda@linux-powerpc.org>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/dlink/sundance.c
+
 SUPERH
 M:     Paul Mundt <lethal@linux-sh.org>
 L:     linux-sh@vger.kernel.org
@@ -8017,7 +8100,7 @@ M:        Vineet Gupta <vgupta@synopsys.com>
 S:     Supported
 F:     arch/arc/
 F:     Documentation/devicetree/bindings/arc/
-F:     drivers/tty/serial/arc-uart.c
+F:     drivers/tty/serial/arc_uart.c
 
 SYSV FILESYSTEM
 M:     Christoph Hellwig <hch@infradead.org>
@@ -8307,9 +8390,14 @@ M:       Chris Metcalf <cmetcalf@tilera.com>
 W:     http://www.tilera.com/scm/
 S:     Supported
 F:     arch/tile/
-F:     drivers/tty/hvc/hvc_tile.c
-F:     drivers/net/ethernet/tile/
+F:     drivers/char/tile-srom.c
 F:     drivers/edac/tile_edac.c
+F:     drivers/net/ethernet/tile/
+F:     drivers/rtc/rtc-tile.c
+F:     drivers/tty/hvc/hvc_tile.c
+F:     drivers/tty/serial/tilegx.c
+F:     drivers/usb/host/*-tilegx.c
+F:     include/linux/usb/tilegx.h
 
 TLAN NETWORK DRIVER
 M:     Samuel Chessman <chessman@tux.org>
@@ -8702,7 +8790,6 @@ L:        linux-usb@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:     Maintained
 F:     drivers/usb/phy/
-F:     drivers/usb/otg/
 
 USB PRINTER DRIVER (usblp)
 M:     Pete Zaitcev <zaitcev@redhat.com>
@@ -8803,7 +8890,6 @@ W:        http://www.linux-usb.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
 S:     Supported
 F:     Documentation/usb/
-F:     drivers/net/usb/
 F:     drivers/usb/
 F:     include/linux/usb.h
 F:     include/linux/usb/
@@ -9026,6 +9112,12 @@ F:       drivers/staging/vme/
 F:     drivers/vme/
 F:     include/linux/vme*
 
+VMWARE HYPERVISOR INTERFACE
+M:     Alok Kataria <akataria@vmware.com>
+L:     virtualization@lists.linux-foundation.org
+S:     Supported
+F:     arch/x86/kernel/cpu/vmware.c
+
 VMWARE VMXNET3 ETHERNET DRIVER
 M:     Shreyas Bhatewara <sbhatewara@vmware.com>
 M:     "VMware, Inc." <pv-drivers@vmware.com>
@@ -9228,7 +9320,7 @@ M:        Matthew Garrett <matthew.garrett@nebula.com>
 L:     platform-driver-x86@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
 S:     Maintained
-F:     drivers/platform/x86
+F:     drivers/platform/x86/
 
 X86 MCE INFRASTRUCTURE
 M:     Tony Luck <tony.luck@intel.com>
@@ -9247,9 +9339,9 @@ F:        drivers/media/tuners/tuner-xc2028.*
 
 XEN HYPERVISOR INTERFACE
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-M:     Jeremy Fitzhardinge <jeremy@goop.org>
-L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
-L:     virtualization@lists.linux-foundation.org
+M:     Boris Ostrovsky <boris.ostrovsky@oracle.com>
+M:     David Vrabel <david.vrabel@citrix.com>
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:     Supported
 F:     arch/x86/xen/
 F:     drivers/*/xen-*front.c
@@ -9260,35 +9352,35 @@ F:      include/uapi/xen/
 
 XEN HYPERVISOR ARM
 M:     Stefano Stabellini <stefano.stabellini@eu.citrix.com>
-L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:     Supported
 F:     arch/arm/xen/
 F:     arch/arm/include/asm/xen/
 
 XEN HYPERVISOR ARM64
 M:     Stefano Stabellini <stefano.stabellini@eu.citrix.com>
-L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:     Supported
 F:     arch/arm64/xen/
 F:     arch/arm64/include/asm/xen/
 
 XEN NETWORK BACKEND DRIVER
 M:     Ian Campbell <ian.campbell@citrix.com>
-L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/xen-netback/*
 
 XEN PCI SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:     Supported
 F:     arch/x86/pci/*xen*
 F:     drivers/pci/*xen*
 
 XEN SWIOTLB SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-L:     xen-devel@lists.xensource.com (moderated for non-subscribers)
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
 S:     Supported
 F:     arch/x86/xen/*swiotlb*
 F:     drivers/xen/*swiotlb*