1 files changed, 189 insertions, 82 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 76f9c0df3e73..cc66549dd761 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -270,12 +270,12 @@ F:	drivers/acpi/
 F:      drivers/pnp/pnpacpi/
 F:      include/linux/acpi.h
 F:      include/acpi/
-F:      Documentation/acpi
+F:      Documentation/acpi/
 F:      Documentation/ABI/testing/sysfs-bus-acpi
 F:      drivers/pci/*acpi*
 F:      drivers/pci/*/*acpi*
 F:      drivers/pci/*/*/*acpi*
-F:      tools/power/acpi
+F:      tools/power/acpi/
 
 ACPI COMPONENT ARCHITECTURE (ACPICA)
 M:      Robert Moore <robert.moore@intel.com>
@@ -563,6 +563,12 @@ S:	Odd Fixes
 L:      linux-alpha@vger.kernel.org
 F:      arch/alpha/
 
+ALTERA MAILBOX DRIVER
+M:      Ley Foon Tan <lftan@altera.com>
+L:      nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/mailbox/mailbox-altera.c
+
 ALTERA TRIPLE SPEED ETHERNET DRIVER
 M:      Vince Bridgers <vbridger@opensource.altera.com>
 L:      netdev@vger.kernel.org
@@ -659,6 +665,13 @@ L:	linux-media@vger.kernel.org
 S:      Maintained
 F:      drivers/media/i2c/ad9389b*
 
+ANALOG DEVICES INC ADV7180 DRIVER
+M:      Lars-Peter Clausen <lars@metafoo.de>
+L:      linux-media@vger.kernel.org
+W:      http://ez.analog.com/community/linux-device-drivers
+S:      Supported
+F:      drivers/media/i2c/adv7180.c
+
 ANALOG DEVICES INC ADV7511 DRIVER
 M:      Hans Verkuil <hans.verkuil@cisco.com>
 L:      linux-media@vger.kernel.org
@@ -696,7 +709,7 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:      http://blackfin.uclinux.org/
 S:      Supported
 F:      sound/soc/blackfin/*
- 
+
 ANALOG DEVICES INC IIO DRIVERS
 M:      Lars-Peter Clausen <lars@metafoo.de>
 M:      Michael Hennerich <Michael.Hennerich@analog.com>
@@ -708,6 +721,16 @@ X:	drivers/iio/*/adjd*
 F:      drivers/staging/iio/*/ad*
 F:      staging/iio/trigger/iio-trig-bfin-timer.c
 
+ANDROID DRIVERS
+M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+M:      Arve Hjønnevåg <arve@android.com>
+M:      Riley Andrews <riandrews@android.com>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
+L:      devel@driverdev.osuosl.org
+S:      Supported
+F:      drivers/android/
+F:      drivers/staging/android/
+
 AOA (Apple Onboard Audio) ALSA DRIVER
 M:      Johannes Berg <johannes@sipsolutions.net>
 L:      linuxppc-dev@lists.ozlabs.org
@@ -724,15 +747,15 @@ F:	include/uapi/linux/apm_bios.h
 F:      drivers/char/apm-emulation.c
 
 APPLE BCM5974 MULTITOUCH DRIVER
-M:      Henrik Rydberg <rydberg@euromail.se>
+M:      Henrik Rydberg <rydberg@bitmath.org>
 L:      linux-input@vger.kernel.org
-S:      Maintained
+S:      Odd fixes
 F:      drivers/input/mouse/bcm5974.c
 
 APPLE SMC DRIVER
-M:      Henrik Rydberg <rydberg@euromail.se>
+M:      Henrik Rydberg <rydberg@bitmath.org>
 L:      lm-sensors@lm-sensors.org
-S:      Maintained
+S:      Odd fixes
 F:      drivers/hwmon/applesmc.c
 
 APPLETALK NETWORK LAYER
@@ -754,13 +777,6 @@ 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
-S:      Maintained
-F:      include/linux/pata_arasan_cf_data.h
-F:      drivers/ata/pata_arasan_cf.c
-
 ARC FRAMEBUFFER DRIVER
 M:      Jaya Kumar <jayalk@intworks.biz>
 S:      Maintained
@@ -1583,6 +1599,7 @@ N:	xilinx
 F:      drivers/clocksource/cadence_ttc_timer.c
 F:      drivers/i2c/busses/i2c-cadence.c
 F:      drivers/mmc/host/sdhci-of-arasan.c
+F:      drivers/edac/synopsys_edac.c
 
 ARM SMMU DRIVER
 M:      Will Deacon <will.deacon@arm.com>
@@ -1657,7 +1674,6 @@ M:	Jiri Slaby <jirislaby@gmail.com>
 M:      Nick Kossifidis <mickflemm@gmail.com>
 M:      "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
 L:      linux-wireless@vger.kernel.org
-L:      ath5k-devel@lists.ath5k.org
 W:      http://wireless.kernel.org/en/users/Drivers/ath5k
 S:      Maintained
 F:      drivers/net/wireless/ath/ath5k/
@@ -2259,6 +2275,7 @@ F:	drivers/gpio/gpio-bt8xx.c
 BTRFS FILE SYSTEM
 M:      Chris Mason <clm@fb.com>
 M:      Josef Bacik <jbacik@fb.com>
+M:      David Sterba <dsterba@suse.cz>
 L:      linux-btrfs@vger.kernel.org
 W:      http://btrfs.wiki.kernel.org/
 Q:      http://patchwork.kernel.org/project/linux-btrfs/list/
@@ -2345,7 +2362,8 @@ CAN NETWORK LAYER
 M:      Oliver Hartkopp <socketcan@hartkopp.net>
 L:      linux-can@vger.kernel.org
 W:      http://gitorious.org/linux-can
-T:      git git://gitorious.org/linux-can/linux-can-next.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
 S:      Maintained
 F:      Documentation/networking/can.txt
 F:      net/can/
@@ -2360,7 +2378,8 @@ M:	Wolfgang Grandegger <wg@grandegger.com>
 M:      Marc Kleine-Budde <mkl@pengutronix.de>
 L:      linux-can@vger.kernel.org
 W:      http://gitorious.org/linux-can
-T:      git git://gitorious.org/linux-can/linux-can-next.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
 S:      Maintained
 F:      drivers/net/can/
 F:      include/linux/can/dev.h
@@ -3182,7 +3201,7 @@ L:	dmaengine@vger.kernel.org
 Q:      https://patchwork.kernel.org/project/linux-dmaengine/list/
 S:      Maintained
 F:      drivers/dma/
-F:      include/linux/dma*
+F:      include/linux/dmaengine.h
 F:      Documentation/dmaengine/
 T:      git git://git.infradead.org/users/vkoul/slave-dma.git
 
@@ -3467,6 +3486,14 @@ M:	"Maciej W. Rozycki" <macro@linux-mips.org>
 S:      Maintained
 F:      drivers/tty/serial/dz.*
 
+E3X0 POWER BUTTON DRIVER
+M:      Moritz Fischer <moritz.fischer@ettus.com>
+L:      usrp-users@lists.ettus.com
+W:      http://www.ettus.com
+S:      Supported
+F:      drivers/input/misc/e3x0-button.c
+F:      Documentation/devicetree/bindings/input/e3x0-button.txt
+
 E4000 MEDIA DRIVER
 M:      Antti Palosaari <crope@iki.fi>
 L:      linux-media@vger.kernel.org
@@ -3508,6 +3535,8 @@ M:	Borislav Petkov <bp@alien8.de>
 M:      Mauro Carvalho Chehab <mchehab@osg.samsung.com>
 L:      linux-edac@vger.kernel.org
 W:      bluesmoke.sourceforge.net
+T:      git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+T:      git://git.kernel.org/pub/linux/kernel/git/mchehab/linux-edac.git#linux_next
 S:      Supported
 F:      Documentation/edac.txt
 F:      drivers/edac/
@@ -4749,20 +4778,20 @@ S:	Supported
 F:      drivers/scsi/ipr.*
 
 IBM Power Virtual Ethernet Device Driver
-M:      Santiago Leon <santil@linux.vnet.ibm.com>
+M:      Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/ibm/ibmveth.*
 
 IBM Power Virtual SCSI Device Drivers
-M:      Nathan Fontenot <nfont@linux.vnet.ibm.com>
+M:      Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/ibmvscsi/ibmvscsi*
 F:      drivers/scsi/ibmvscsi/viosrp.h
 
 IBM Power Virtual FC Device Drivers
-M:      Brian King <brking@linux.vnet.ibm.com>
+M:      Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      drivers/scsi/ibmvscsi/ibmvfc*
@@ -4930,7 +4959,6 @@ F:	include/uapi/linux/inotify.h
 
 INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
 M:      Dmitry Torokhov <dmitry.torokhov@gmail.com>
-M:      Dmitry Torokhov <dtor@mail.ru>
 L:      linux-input@vger.kernel.org
 Q:      http://patchwork.kernel.org/project/linux-input/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
@@ -4941,18 +4969,27 @@ F:	include/uapi/linux/input.h
 F:      include/linux/input/
 
 INPUT MULTITOUCH (MT) PROTOCOL
-M:      Henrik Rydberg <rydberg@euromail.se>
+M:      Henrik Rydberg <rydberg@bitmath.org>
 L:      linux-input@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
-S:      Maintained
+S:      Odd fixes
 F:      Documentation/input/multi-touch-protocol.txt
 F:      drivers/input/input-mt.c
 K:      \b(ABS|SYN)_MT_
 
+INTEL ASoC BDW/HSW DRIVERS
+M:      Jie Yang <yang.jie@linux.intel.com>
+L:      alsa-devel@alsa-project.org
+S:      Supported
+F:      sound/soc/intel/sst-haswell*
+F:      sound/soc/intel/sst-dsp*
+F:      sound/soc/intel/sst-firmware.c
+F:      sound/soc/intel/broadwell.c
+F:      sound/soc/intel/haswell.c
+
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:      Intel SCU Linux support <intel-linux-scu@intel.com>
 M:      Artur Paszkiewicz <artur.paszkiewicz@intel.com>
-M:      Dave Jiang <dave.jiang@intel.com>
 L:      linux-scsi@vger.kernel.org
 T:      git git://git.code.sf.net/p/intel-sas/isci
 S:      Supported
@@ -5280,6 +5317,15 @@ W:	www.open-iscsi.org
 Q:      http://patchwork.kernel.org/project/linux-rdma/list/
 F:      drivers/infiniband/ulp/iser/
 
+ISCSI EXTENSIONS FOR RDMA (ISER) TARGET
+M:      Sagi Grimberg <sagig@mellanox.com>
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
+L:      linux-rdma@vger.kernel.org
+L:      target-devel@vger.kernel.org
+S:      Supported
+W:      http://www.linux-iscsi.org
+F:      drivers/infiniband/ulp/isert
+
 ISDN SUBSYSTEM
 M:      Karsten Keil <isdn@linux-pingi.de>
 L:      isdn4linux@listserv.isdn4linux.de (subscribers-only)
@@ -5694,6 +5740,49 @@ F:	drivers/lguest/
 F:      include/linux/lguest*.h
 F:      tools/lguest/
 
+LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
+M:      Tejun Heo <tj@kernel.org>
+L:      linux-ide@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+S:      Maintained
+F:      drivers/ata/
+F:      include/linux/ata.h
+F:      include/linux/libata.h
+
+LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
+M:      Viresh Kumar <viresh.linux@gmail.com>
+L:      linux-ide@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+S:      Maintained
+F:      include/linux/pata_arasan_cf_data.h
+F:      drivers/ata/pata_arasan_cf.c
+
+LIBATA PATA DRIVERS
+M:      Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+M:      Tejun Heo <tj@kernel.org>
+L:      linux-ide@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+S:      Maintained
+F:      drivers/ata/pata_*.c
+F:      drivers/ata/ata_generic.c
+
+LIBATA SATA AHCI PLATFORM devices support
+M:      Hans de Goede <hdegoede@redhat.com>
+M:      Tejun Heo <tj@kernel.org>
+L:      linux-ide@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+S:      Maintained
+F:      drivers/ata/ahci_platform.c
+F:      drivers/ata/libahci_platform.c
+F:      include/linux/ahci_platform.h
+
+LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
+M:      Mikael Pettersson <mikpelinux@gmail.com>
+L:      linux-ide@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+S:      Maintained
+F:      drivers/ata/sata_promise.*
+
 LIBLOCKDEP
 M:      Sasha Levin <sasha.levin@oracle.com>
 S:      Maintained
@@ -5785,6 +5874,21 @@ F:	Documentation/misc-devices/lis3lv02d
 F:      drivers/misc/lis3lv02d/
 F:      drivers/platform/x86/hp_accel.c
 
+LIVE PATCHING
+M:      Josh Poimboeuf <jpoimboe@redhat.com>
+M:      Seth Jennings <sjenning@redhat.com>
+M:      Jiri Kosina <jkosina@suse.cz>
+M:      Vojtech Pavlik <vojtech@suse.cz>
+S:      Maintained
+F:      kernel/livepatch/
+F:      include/linux/livepatch.h
+F:      arch/x86/include/asm/livepatch.h
+F:      arch/x86/kernel/livepatch.c
+F:      Documentation/ABI/testing/sysfs-kernel-livepatch
+F:      samples/livepatch/
+L:      live-patching@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
+
 LLC (802.2)
 M:      Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 S:      Maintained
@@ -6083,6 +6187,13 @@ F:	Documentation/devicetree/bindings/i2c/max6697.txt
 F:      drivers/hwmon/max6697.c
 F:      include/linux/platform_data/max6697.h
 
+MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
+M:      Krzysztof Kozlowski <k.kozlowski@samsung.com>
+L:      linux-pm@vger.kernel.org
+S:      Supported
+F:      drivers/power/max14577_charger.c
+F:      drivers/power/max77693_charger.c
+
 MAXIRADIO FM RADIO RECEIVER DRIVER
 M:      Hans Verkuil <hverkuil@xs4all.nl>
 L:      linux-media@vger.kernel.org
@@ -6113,14 +6224,6 @@ 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/SAS DRIVERS
 M:      Kashyap Desai <kashyap.desai@avagotech.com>
 M:      Sumit Saxena <sumit.saxena@avagotech.com>
@@ -6569,6 +6672,7 @@ F:	include/linux/netdevice.h
 F:      include/uapi/linux/in.h
 F:      include/uapi/linux/net.h
 F:      include/uapi/linux/netdevice.h
+F:      include/uapi/linux/net_namespace.h
 F:      tools/net/
 F:      tools/testing/selftests/net/
 F:      lib/random32.c
@@ -6978,14 +7082,12 @@ OPEN FIRMWARE AND FLATTENED DEVICE TREE
 M:      Grant Likely <grant.likely@linaro.org>
 M:      Rob Herring <robh+dt@kernel.org>
 L:      devicetree@vger.kernel.org
-W:      http://fdt.secretlab.ca
-T:      git git://git.secretlab.ca/git/linux-2.6.git
+W:      http://www.devicetree.org/
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
 S:      Maintained
 F:      drivers/of/
 F:      include/linux/of*.h
 F:      scripts/dtc/
-K:      of_get_property
-K:      of_match_table
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 M:      Rob Herring <robh+dt@kernel.org>
@@ -7009,11 +7111,12 @@ F:	arch/openrisc/
 
 OPENVSWITCH
 M:      Pravin Shelar <pshelar@nicira.com>
+L:      netdev@vger.kernel.org
 L:      dev@openvswitch.org
 W:      http://openvswitch.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch.git
 S:      Maintained
 F:      net/openvswitch/
+F:      include/uapi/linux/openvswitch.h
 
 OPL4 DRIVER
 M:      Clemens Ladisch <clemens@ladisch.de>
@@ -7211,6 +7314,14 @@ F:	include/linux/pci*
 F:      arch/x86/pci/
 F:      arch/x86/kernel/quirks.c
 
+PCI DRIVER FOR ARM VERSATILE PLATFORM
+M:      Rob Herring <robh@kernel.org>
+L:      linux-pci@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org
+S:      Maintained
+F:      Documentation/devicetree/bindings/pci/versatile.txt
+F:      drivers/pci/host/pci-versatile.c
+
 PCI DRIVER FOR APPLIEDMICRO XGENE
 M:      Tanmay Inamdar <tinamdar@apm.com>
 L:      linux-pci@vger.kernel.org
@@ -7230,7 +7341,7 @@ S:	Maintained
 F:      drivers/pci/host/*layerscape*
 
 PCI DRIVER FOR IMX6
-M:      Richard Zhu <r65037@freescale.com>
+M:      Richard Zhu <Richard.Zhu@freescale.com>
 M:      Lucas Stach <l.stach@pengutronix.de>
 L:      linux-pci@vger.kernel.org
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -7400,6 +7511,7 @@ F:	drivers/crypto/picoxcell*
 PIN CONTROL SUBSYSTEM
 M:      Linus Walleij <linus.walleij@linaro.org>
 L:      linux-gpio@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
 S:      Maintained
 F:      drivers/pinctrl/
 F:      include/linux/pinctrl/
@@ -7567,12 +7679,6 @@ W:	http://wireless.kernel.org/en/users/Drivers/p54
 S:      Obsolete
 F:      drivers/net/wireless/prism54/
 
-PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER
-M:      Mikael Pettersson <mikpelinux@gmail.com>
-L:      linux-ide@vger.kernel.org
-S:      Maintained
-F:      drivers/ata/sata_promise.*
-
 PS3 NETWORK SUPPORT
 M:      Geoff Levand <geoff@infradead.org>
 L:      netdev@vger.kernel.org
@@ -7738,8 +7844,7 @@ F:	Documentation/scsi/LICENSE.qla2xxx
 F:      drivers/scsi/qla2xxx/
 
 QLOGIC QLA4XXX iSCSI DRIVER
-M:      Vikas Chaudhary <vikas.chaudhary@qlogic.com>
-M:      iscsi-driver@qlogic.com
+M:      QLogic-Storage-Upstream@qlogic.com
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      Documentation/scsi/LICENSE.qla4xxx
@@ -7818,14 +7923,6 @@ T:	git git://github.com/KrasnikovEugene/wcn36xx.git
 S:      Supported
 F:      drivers/net/wireless/ath/wcn36xx/
 
-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>
@@ -8014,6 +8111,13 @@ S:	Maintained
 F:      Documentation/rfkill.txt
 F:      net/rfkill/
 
+RHASHTABLE
+M:      Thomas Graf <tgraf@suug.ch>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      lib/rhashtable.c
+F:      include/linux/rhashtable.h
+
 RICOH SMARTMEDIA/XD DRIVER
 M:      Maxim Levitsky <maximlevitsky@gmail.com>
 S:      Maintained
@@ -8356,12 +8460,6 @@ F:	kernel/time/clocksource.c
 F:      kernel/time/time*.c
 F:      kernel/time/ntp.c
 
-TLG2300 VIDEO4LINUX-2 DRIVER
-M:      Huang Shijie <shijie8@gmail.com>
-M:      Hans Verkuil <hverkuil@xs4all.nl>
-S:      Odd Fixes
-F:      drivers/media/usb/tlg2300/
-
 SC1200 WDT DRIVER
 M:      Zwane Mwaikambo <zwanem@gmail.com>
 S:      Maintained
@@ -8547,25 +8645,6 @@ S:	Maintained
 F:      drivers/misc/phantom.c
 F:      include/uapi/linux/phantom.h
 
-SERIAL ATA (SATA) SUBSYSTEM
-M:      Tejun Heo <tj@kernel.org>
-L:      linux-ide@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
-S:      Supported
-F:      drivers/ata/
-F:      include/linux/ata.h
-F:      include/linux/libata.h
-
-SERIAL ATA AHCI PLATFORM devices support
-M:      Hans de Goede <hdegoede@redhat.com>
-M:      Tejun Heo <tj@kernel.org>
-L:      linux-ide@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
-S:      Supported
-F:      drivers/ata/ahci_platform.c
-F:      drivers/ata/libahci_platform.c
-F:      include/linux/ahci_platform.h
-
 SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 M:      Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
 L:      linux-scsi@vger.kernel.org
@@ -8746,6 +8825,15 @@ S:	Maintained
 F:      drivers/media/platform/davinci/
 F:      include/media/davinci/
 
+TI AM437X VPFE DRIVER
+M:      Lad, Prabhakar <prabhakar.csengg@gmail.com>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+T:      git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
+S:      Maintained
+F:      drivers/media/platform/am437x/
+
 SIS 190 ETHERNET DRIVER
 M:      Francois Romieu <romieu@fr.zoreil.com>
 L:      netdev@vger.kernel.org
@@ -8827,6 +8915,8 @@ F:	drivers/media/i2c/smiapp/
 F:      include/media/smiapp.h
 F:      drivers/media/i2c/smiapp-pll.c
 F:      drivers/media/i2c/smiapp-pll.h
+F:      include/uapi/linux/smiapp.h
+F:      Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
 
 SMM665 HARDWARE MONITOR DRIVER
 M:      Guenter Roeck <linux@roeck-us.net>
@@ -8893,6 +8983,7 @@ SOFTLOGIC 6x10 MPEG CODEC
 M:      Bluecherry Maintainers <maintainers@bluecherrydvr.com>
 M:      Andrey Utkin <andrey.utkin@corp.bluecherry.net>
 M:      Andrey Utkin <andrey.krieger.utkin@gmail.com>
+M:      Ismael Luceno <ismael@iodev.co.uk>
 L:      linux-media@vger.kernel.org
 S:      Supported
 F:      drivers/media/pci/solo6x10/
@@ -9205,6 +9296,13 @@ F:	arch/m68k/sun3*/
 F:      arch/m68k/include/asm/sun3*
 F:      drivers/net/ethernet/i825xx/sun3*
 
+SUN4I LOW RES ADC ATTACHED TABLET KEYS DRIVER
+M:      Hans de Goede <hdegoede@redhat.com>
+L:      linux-input@vger.kernel.org
+S:      Maintained
+F:      Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
+F:      drivers/input/keyboard/sun4i-lradc-keys.c
+
 SUNDANCE NETWORK DRIVER
 M:      Denis Kirjanov <kda@linux-powerpc.org>
 L:      netdev@vger.kernel.org
@@ -9213,7 +9311,6 @@ F:	drivers/net/ethernet/dlink/sundance.c
 
 SUPERH
 L:      linux-sh@vger.kernel.org
-W:      http://www.linux-sh.org
 Q:      http://patchwork.kernel.org/project/linux-sh/list/
 S:      Orphan
 F:      Documentation/sh/
@@ -9534,7 +9631,8 @@ F:	drivers/platform/x86/thinkpad_acpi.c
 TI BANDGAP AND THERMAL DRIVER
 M:      Eduardo Valentin <edubezval@gmail.com>
 L:      linux-pm@vger.kernel.org
-S:      Supported
+L:      linux-omap@vger.kernel.org
+S:      Maintained
 F:      drivers/thermal/ti-soc-thermal/
 
 TI CLOCK DRIVER
@@ -9591,6 +9689,13 @@ F:	drivers/power/lp8788-charger.c
 F:      drivers/regulator/lp8788-*.c
 F:      include/linux/mfd/lp8788*.h
 
+TI NETCP ETHERNET DRIVER
+M:      Wingman Kwok <w-kwok2@ti.com>
+M:      Murali Karicheri <m-karicheri2@ti.com>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      drivers/net/ethernet/ti/netcp*
+
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:      Peter Ujfalusi <peter.ujfalusi@ti.com>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -10147,6 +10252,7 @@ USERSPACE I/O (UIO)
 M:      "Hans J. Koch" <hjk@hansjkoch.de>
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:      Maintained
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 F:      Documentation/DocBook/uio-howto.tmpl
 F:      drivers/uio/
 F:      include/linux/uio*.h
@@ -10629,6 +10735,7 @@ M:	Max Filippov <jcmvbkbc@gmail.com>
 L:      linux-xtensa@linux-xtensa.org
 S:      Maintained
 F:      drivers/spi/spi-xtensa-xtfpga.c
+F:      sound/soc/xtensa/xtfpga-i2s.c
 
 YAM DRIVER FOR AX.25
 M:      Jean-Paul Roubelat <jpr@f6fbb.org>