1 files changed, 256 insertions, 104 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index dd31933400e8..a20df9bf8ab0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -152,8 +152,9 @@ F:	drivers/scsi/53c700*
 
 6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 M:      Alexander Aring <alex.aring@gmail.com>
-L:      linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
+M:      Jukka Rissanen <jukka.rissanen@linux.intel.com>
 L:      linux-bluetooth@vger.kernel.org
+L:      linux-wpan@vger.kernel.org
 S:      Maintained
 F:      net/6lowpan/
 F:      include/net/6lowpan.h
@@ -563,7 +564,7 @@ L:	linux-alpha@vger.kernel.org
 F:      arch/alpha/
 
 ALTERA TRIPLE SPEED ETHERNET DRIVER
-M:      Vince Bridgers <vbridgers2013@gmail.com>
+M:      Vince Bridgers <vbridger@opensource.altera.com>
 L:      netdev@vger.kernel.org
 L:      nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 S:      Maintained
@@ -685,6 +686,17 @@ 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>
+W:      http://wiki.analog.com/
+W:      http://ez.analog.com/community/linux-device-drivers
+S:      Supported
+F:      drivers/iio/*/ad*
+X:      drivers/iio/*/adjd*
+F:      drivers/staging/iio/*/ad*
+F:      staging/iio/trigger/iio-trig-bfin-timer.c
 
 AOA (Apple Onboard Audio) ALSA DRIVER
 M:      Johannes Berg <johannes@sipsolutions.net>
@@ -722,7 +734,6 @@ F:	net/appletalk/
 APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
 M:      Iyappan Subramanian <isubramanian@apm.com>
 M:      Keyur Chudgar <kchudgar@apm.com>
-M:      Ravi Patel <rapatel@apm.com>
 S:      Supported
 F:      drivers/net/ethernet/apm/xgene/
 F:      Documentation/devicetree/bindings/net/apm-xgene-enet.txt
@@ -835,6 +846,12 @@ M:	Emilio López <emilio@elopez.com.ar>
 S:      Maintained
 F:      drivers/clk/sunxi/
 
+ARM/Amlogic MesonX SoC support
+M:      Carlo Caione <carlo@caione.org>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+N:      meson[x68]
+
 ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
 M:      Andrew Victor <linux@maxim.org.za>
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
@@ -861,10 +878,9 @@ S:	Maintained
 F:      arch/arm/mach-highbank/
 
 ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
-M:      Anton Vorontsov <anton@enomsg.org>
+M:      Krzysztof Halasa <khalasa@piap.pl>
 S:      Maintained
 F:      arch/arm/mach-cns3xxx/
-T:      git git://git.infradead.org/users/cbou/linux-cns3xxx.git
 
 ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
 M:      Alexander Shiyan <shc_work@mail.ru>
@@ -964,7 +980,7 @@ F:	arch/arm/include/asm/hardware/dec21285.h
 F:      arch/arm/mach-footbridge/
 
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
-M:      Shawn Guo <shawn.guo@freescale.com>
+M:      Shawn Guo <shawn.guo@linaro.org>
 M:      Sascha Hauer <kernel@pengutronix.de>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
@@ -1025,24 +1041,20 @@ F:	arch/arm/mach-pxa/colibri-pxa270-income.c
 
 ARM/INTEL IOP32X ARM ARCHITECTURE
 M:      Lennert Buytenhek <kernel@wantstofly.org>
-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 <dan.j.williams@intel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:      Maintained
+S:      Orphan
 
 ARM/INTEL IOP13XX ARM ARCHITECTURE
 M:      Lennert Buytenhek <kernel@wantstofly.org>
-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 <dan.j.williams@intel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 
@@ -1053,7 +1065,7 @@ S:	Maintained
 
 ARM/INTEL IXP4XX ARM ARCHITECTURE
 M:      Imre Kaloz <kaloz@openwrt.org>
-M:      Krzysztof Halasa <khc@pm.waw.pl>
+M:      Krzysztof Halasa <khalasa@piap.pl>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-ixp4xx/
@@ -1067,7 +1079,6 @@ F:	drivers/pcmcia/pxa2xx_stargate2.c
 
 ARM/INTEL XSC3 (MANZANO) ARM CORE
 M:      Lennert Buytenhek <kernel@wantstofly.org>
-M:      Dan Williams <dan.j.williams@intel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 
@@ -1077,33 +1088,33 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 
 ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-keystone/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 
 ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      drivers/clk/keystone/
 
 ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      drivers/clocksource/timer-keystone.c
 
 ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      drivers/power/reset/keystone-reset.c
 
 ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 F:      drivers/memory/*emif*
@@ -1150,6 +1161,16 @@ W:	http://www.digriz.org.uk/ts78xx/kernel
 S:      Maintained
 F:      arch/arm/mach-orion5x/ts78xx-*
 
+ARM/Mediatek SoC support
+M:      Matthias Brugger <matthias.bgg@gmail.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      arch/arm/boot/dts/mt6*
+F:      arch/arm/boot/dts/mt8*
+F:      arch/arm/mach-mediatek/
+N:      mtk
+K:      mediatek
+
 ARM/MICREL KS8695 ARCHITECTURE
 M:      Greg Ungerer <gerg@uclinux.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1317,8 +1338,7 @@ ARM/SAMSUNG MOBILE MACHINE SUPPORT
 M:      Kyungmin Park <kyungmin.park@samsung.com>
 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-s5pv210/
 
 ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
 M:      Kyungmin Park <kyungmin.park@samsung.com>
@@ -1361,7 +1381,6 @@ F:	arch/arm/boot/dts/sh*
 F:      arch/arm/configs/ape6evm_defconfig
 F:      arch/arm/configs/armadillo800eva_defconfig
 F:      arch/arm/configs/bockw_defconfig
-F:      arch/arm/configs/genmai_defconfig
 F:      arch/arm/configs/koelsch_defconfig
 F:      arch/arm/configs/kzm9g_defconfig
 F:      arch/arm/configs/lager_defconfig
@@ -1372,15 +1391,23 @@ F:	arch/arm/mach-shmobile/
 F:      drivers/sh/
 
 ARM/SOCFPGA ARCHITECTURE
-M:      Dinh Nguyen <dinguyen@altera.com>
+M:      Dinh Nguyen <dinguyen@opensource.altera.com>
 S:      Maintained
 F:      arch/arm/mach-socfpga/
+W:      http://www.rocketboards.org
+T:      git://git.rocketboards.org/linux-socfpga.git
+T:      git://git.rocketboards.org/linux-socfpga-next.git
 
 ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
-M:      Dinh Nguyen <dinguyen@altera.com>
+M:      Dinh Nguyen <dinguyen@opensource.altera.com>
 S:      Maintained
 F:      drivers/clk/socfpga/
 
+ARM/SOCFPGA EDAC SUPPORT
+M:      Thor Thayer <tthayer@opensource.altera.com>
+S:      Maintained
+F:      drivers/edac/altera_edac.
+
 ARM/STI ARCHITECTURE
 M:      Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
 M:      Maxime Coquelin <maxime.coquelin@st.com>
@@ -1392,12 +1419,17 @@ S:	Maintained
 F:      arch/arm/mach-sti/
 F:      arch/arm/boot/dts/sti*
 F:      drivers/clocksource/arm_global_timer.c
-F:      drivers/reset/sti/
-F:      drivers/pinctrl/pinctrl-st.c
-F:      drivers/media/rc/st_rc.c
 F:      drivers/i2c/busses/i2c-st.c
-F:      drivers/tty/serial/st-asc.c
+F:      drivers/media/rc/st_rc.c
 F:      drivers/mmc/host/sdhci-st.c
+F:      drivers/phy/phy-stih407-usb.c
+F:      drivers/phy/phy-stih41x-usb.c
+F:      drivers/pinctrl/pinctrl-st.c
+F:      drivers/reset/sti/
+F:      drivers/tty/serial/st-asc.c
+F:      drivers/usb/dwc3/dwc3-st.c
+F:      drivers/usb/host/ehci-st.c
+F:      drivers/usb/host/ohci-st.c
 
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
@@ -1517,6 +1549,7 @@ T:	git git://git.xilinx.com/linux-xlnx.git
 S:      Supported
 F:      arch/arm/mach-zynq/
 F:      drivers/cpuidle/cpuidle-zynq.c
+F:      drivers/block/xsysace.c
 N:      zynq
 N:      xilinx
 F:      drivers/clocksource/cadence_ttc_timer.c
@@ -1562,9 +1595,9 @@ F:	drivers/platform/x86/asus*.c
 F:      drivers/platform/x86/eeepc*.c
 
 ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
-M:      Dan Williams <dan.j.williams@intel.com>
+R:      Dan Williams <dan.j.williams@intel.com>
 W:      http://sourceforge.net/projects/xscaleiop
-S:      Maintained
+S:      Odd fixes
 F:      Documentation/crypto/async-tx-api.txt
 F:      crypto/async_tx/
 F:      drivers/dma/
@@ -1616,6 +1649,7 @@ L:	wil6210@qca.qualcomm.com
 S:      Supported
 W:      http://wireless.kernel.org/en/users/Drivers/wil6210
 F:      drivers/net/wireless/ath/wil6210/
+F:      include/uapi/linux/wil6210_uapi.h
 
 CARL9170 LINUX COMMUNITY WIRELESS DRIVER
 M:      Christian Lamparter <chunkeey@googlemail.com>
@@ -1665,6 +1699,12 @@ M:	Nicolas Ferre <nicolas.ferre@atmel.com>
 S:      Supported
 F:      drivers/tty/serial/atmel_serial.c
 
+ATMEL Audio ALSA driver
+M:      Bo Shen <voice.shen@atmel.com>
+L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:      Supported
+F:      sound/soc/atmel
+
 ATMEL DMA DRIVER
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1698,6 +1738,12 @@ M:	Nicolas Ferre <nicolas.ferre@atmel.com>
 S:      Supported
 F:      drivers/net/ethernet/cadence/
 
+ATMEL NAND DRIVER
+M:      Josh Wu <josh.wu@atmel.com>
+L:      linux-mtd@lists.infradead.org
+S:      Supported
+F:      drivers/mtd/nand/atmel_nand*
+
 ATMEL SPI DRIVER
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
 S:      Supported
@@ -2004,6 +2050,7 @@ F:	drivers/net/ethernet/broadcom/bnx2x/
 BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
 M:      Christian Daudt <bcm@fixthebug.org>
 M:      Matt Porter <mporter@linaro.org>
+M:      Florian Fainelli <f.fainelli@gmail.com>
 L:      bcm-kernel-feedback-list@broadcom.com
 T:      git git://github.com/broadcom/mach-bcm
 S:      Maintained
@@ -2015,17 +2062,14 @@ 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
+BROADCOM BCM2835 ARM ARCHITECTURE
 M:      Stephen Warren <swarren@wwwdotorg.org>
 L:      linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
 S:      Maintained
-F:      arch/arm/mach-bcm/board_bcm2835.c
-F:      arch/arm/boot/dts/bcm2835*
-F:      arch/arm/configs/bcm2835_defconfig
-F:      drivers/*/*bcm2835*
+N:      bcm2835
 
-BROADCOM BCM5301X ARM ARCHICTURE
+BROADCOM BCM5301X ARM ARCHITECTURE
 M:      Hauke Mehrtens <hauke@hauke-m.de>
 L:      linux-arm-kernel@lists.infradead.org
 S:      Maintained
@@ -2033,6 +2077,14 @@ F:	arch/arm/mach-bcm/bcm_5301x.c
 F:      arch/arm/boot/dts/bcm5301x.dtsi
 F:      arch/arm/boot/dts/bcm470*
 
+BROADCOM BCM63XX ARM ARCHITECTURE
+M:      Florian Fainelli <f.fainelli@gmail.com>
+L:      linux-arm-kernel@lists.infradead.org
+T:      git git://git.github.com/brcm/linux.git
+S:      Maintained
+F:      arch/arm/mach-bcm/bcm63xx.c
+F:      arch/arm/include/debug/bcm63xx.S
+
 BROADCOM BCM7XXX ARM ARCHITECTURE
 M:      Marc Carino <marc.ceeeee@gmail.com>
 M:      Brian Norris <computersforpeace@gmail.com>
@@ -2098,7 +2150,7 @@ S:	Supported
 F:      drivers/scsi/bfa/
 
 BROCADE BNA 10 GIGABIT ETHERNET DRIVER
-M:      Rasesh Mody <rmody@brocade.com>
+M:      Rasesh Mody <rasesh.mody@qlogic.com>
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/brocade/bna/
@@ -2711,6 +2763,18 @@ W:	http://www.chelsio.com
 S:      Supported
 F:      drivers/net/ethernet/chelsio/cxgb4vf/
 
+CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
+M:      Ian Munsie <imunsie@au1.ibm.com>
+M:      Michael Neuling <mikey@neuling.org>
+L:      linuxppc-dev@lists.ozlabs.org
+S:      Supported
+F:      drivers/misc/cxl/
+F:      include/misc/cxl.h
+F:      include/uapi/misc/cxl.h
+F:      Documentation/powerpc/cxl.txt
+F:      Documentation/powerpc/cxl.txt
+F:      Documentation/ABI/testing/sysfs-class-cxl
+
 STMMAC ETHERNET DRIVER
 M:      Giuseppe Cavallaro <peppe.cavallaro@st.com>
 L:      netdev@vger.kernel.org
@@ -2848,6 +2912,7 @@ F:	drivers/platform/x86/dell-wmi.c
 DESIGNWARE USB2 DRD IP DRIVER
 M:      Paul Zimmerman <paulz@synopsys.com>
 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/dwc2/
 
@@ -2859,6 +2924,13 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:      Maintained
 F:      drivers/usb/dwc3/
 
+DEVICE COREDUMP (DEV_COREDUMP)
+M:      Johannes Berg <johannes@sipsolutions.net>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/base/devcoredump.c
+F:      include/linux/devcoredump.h
+
 DEVICE FREQUENCY (DEVFREQ)
 M:      MyungJoo Ham <myungjoo.ham@samsung.com>
 M:      Kyungmin Park <kyungmin.park@samsung.com>
@@ -2979,7 +3051,7 @@ M:	Sumit Semwal <sumit.semwal@linaro.org>
 S:      Maintained
 L:      linux-media@vger.kernel.org
 L:      dri-devel@lists.freedesktop.org
-L:      linaro-mm-sig@lists.linaro.org
+L:      linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
 F:      drivers/dma-buf/
 F:      include/linux/dma-buf*
 F:      include/linux/reservation.h
@@ -2989,13 +3061,11 @@ 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 <dan.j.williams@intel.com>
 L:      dmaengine@vger.kernel.org
 Q:      https://patchwork.kernel.org/project/linux-dmaengine/list/
-S:      Supported
+S:      Maintained
 F:      drivers/dma/
 F:      include/linux/dma*
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git
 T:      git git://git.infradead.org/users/vkoul/slave-dma.git (slave-dma)
 
 DME1737 HARDWARE MONITOR DRIVER
@@ -3012,9 +3082,8 @@ S:	Supported
 F:      drivers/acpi/dock.c
 
 DOCUMENTATION
-M:      Randy Dunlap <rdunlap@infradead.org>
+M:      Jonathan Corbet <corbet@lwn.net>
 L:      linux-doc@vger.kernel.org
-T:      quilt http://www.infradead.org/~rdunlap/Doc/patches/
 S:      Maintained
 F:      Documentation/
 X:      Documentation/ABI/
@@ -3551,6 +3620,11 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
 F:      drivers/video/fbdev/s1d13xxxfb.c
 F:      include/video/s1d13xxxfb.h
 
+ET131X NETWORK DRIVER
+M:      Mark Einon <mark.einon@gmail.com>
+S:      Odd Fixes
+F:      drivers/net/ethernet/agere/
+
 ETHERNET BRIDGE
 M:      Stephen Hemminger <stephen@networkplumber.org>
 L:      bridge@lists.linux-foundation.org
@@ -4172,6 +4246,16 @@ L:	linuxppc-dev@lists.ozlabs.org
 S:      Odd Fixes
 F:      drivers/tty/hvc/
 
+HACKRF MEDIA DRIVER
+M:      Antti Palosaari <crope@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+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/usb/hackrf/
+
 HARDWARE MONITORING
 M:      Jean Delvare <jdelvare@suse.de>
 M:      Guenter Roeck <linux@roeck-us.net>
@@ -4215,9 +4299,8 @@ S:	Maintained
 F:      drivers/media/dvb-frontends/hd29l2*
 
 HEWLETT-PACKARD SMART2 RAID DRIVER
-M:      Chirag Kantharia <chirag.kantharia@hp.com>
 L:      iss_storagedev@hp.com
-S:      Maintained
+S:      Orphan
 F:      Documentation/blockdev/cpqarray.txt
 F:      drivers/block/cpqarray.*
 
@@ -4477,7 +4560,6 @@ M:	Mika Westerberg <mika.westerberg@linux.intel.com>
 L:      linux-i2c@vger.kernel.org
 L:      linux-acpi@vger.kernel.org
 S:      Maintained
-F:      drivers/i2c/i2c-acpi.c
 
 I2C-TAOS-EVM DRIVER
 M:      Jean Delvare <jdelvare@suse.de>
@@ -4597,13 +4679,14 @@ F:	drivers/idle/i7300_idle.c
 
 IEEE 802.15.4 SUBSYSTEM
 M:      Alexander Aring <alex.aring@gmail.com>
-L:      linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
-W:      http://apps.sourceforge.net/trac/linux-zigbee
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
+L:      linux-wpan@vger.kernel.org
+W:      https://github.com/linux-wpan
+T:      git git://github.com/linux-wpan/linux-wpan-next.git
 S:      Maintained
 F:      net/ieee802154/
 F:      net/mac802154/
 F:      drivers/net/ieee802154/
+F:      Documentation/networking/ieee802154.txt
 
 IGUANAWORKS USB IR TRANSCEIVER
 M:      Sean Young <sean@mess.org>
@@ -4613,6 +4696,9 @@ F:	drivers/media/rc/iguanair.c
 
 IIO SUBSYSTEM AND DRIVERS
 M:      Jonathan Cameron <jic23@kernel.org>
+R:      Hartmut Knaack <knaack.h@gmx.de>
+R:      Lars-Peter Clausen <lars@metafoo.de>
+R:      Peter Meerwald <pmeerw@pmeerw.net>
 L:      linux-iio@vger.kernel.org
 S:      Maintained
 F:      drivers/iio/
@@ -4750,8 +4836,8 @@ F:	arch/x86/kernel/cpu/microcode/core*
 F:      arch/x86/kernel/cpu/microcode/intel*
 
 INTEL I/OAT DMA DRIVER
-M:      Dan Williams <dan.j.williams@intel.com>
 M:      Dave Jiang <dave.jiang@intel.com>
+R:      Dan Williams <dan.j.williams@intel.com>
 L:      dmaengine@vger.kernel.org
 Q:      https://patchwork.kernel.org/project/linux-dmaengine/list/
 S:      Supported
@@ -4766,12 +4852,12 @@ F:	drivers/iommu/intel-iommu.c
 F:      include/linux/intel-iommu.h
 
 INTEL IOP-ADMA DMA DRIVER
-M:      Dan Williams <dan.j.williams@intel.com>
+R:      Dan Williams <dan.j.williams@intel.com>
 S:      Odd fixes
 F:      drivers/dma/iop-adma.c
 
 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
-M:      Krzysztof Halasa <khc@pm.waw.pl>
+M:      Krzysztof Halasa <khalasa@piap.pl>
 S:      Maintained
 F:      arch/arm/mach-ixp4xx/include/mach/qmgr.h
 F:      arch/arm/mach-ixp4xx/include/mach/npe.h
@@ -4785,14 +4871,14 @@ 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/i40e/i40evf)
+INTEL ETHERNET DRIVERS (e100/e1000/e1000e/fm10k/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
 M:      Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 M:      Jesse Brandeburg <jesse.brandeburg@intel.com>
 M:      Bruce Allan <bruce.w.allan@intel.com>
 M:      Carolyn Wyborny <carolyn.wyborny@intel.com>
 M:      Don Skidmore <donald.c.skidmore@intel.com>
 M:      Greg Rose <gregory.v.rose@intel.com>
-M:      Alex Duyck <alexander.h.duyck@intel.com>
+M:      Matthew Vick <matthew.vick@intel.com>
 M:      John Ronciak <john.ronciak@intel.com>
 M:      Mitch Williams <mitch.a.williams@intel.com>
 M:      Linux NICS <linux.nics@intel.com>
@@ -4981,6 +5067,7 @@ L:	linux-kernel@vger.kernel.org
 S:      Maintained
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 T:      git git://git.infradead.org/users/jcooper/linux.git irqchip/core
+F:      Documentation/devicetree/bindings/interrupt-controller/
 F:      drivers/irqchip/
 
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
@@ -5022,6 +5109,7 @@ F:	include/scsi/*iscsi*
 
 ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
 M:      Or Gerlitz <ogerlitz@mellanox.com>
+M:      Sagi Grimberg <sagig@mellanox.com>
 M:      Roi Dayan <roid@mellanox.com>
 L:      linux-rdma@vger.kernel.org
 S:      Supported
@@ -5066,7 +5154,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/tuner_it913x*
+F:      drivers/media/tuners/it913x*
 
 IVTV VIDEO4LINUX DRIVER
 M:      Andy Walls <awalls@md.metrocast.net>
@@ -5214,6 +5302,13 @@ F:	include/linux/lockd/
 F:      include/linux/sunrpc/
 F:      include/uapi/linux/sunrpc/
 
+KERNEL SELFTEST FRAMEWORK
+M:      Shuah Khan <shuahkh@osg.samsung.com>
+L:      linux-api@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/shuah/linux-kselftest
+S:      Maintained
+F:      tools/testing/selftests
+
 KERNEL VIRTUAL MACHINE (KVM)
 M:      Gleb Natapov <gleb@kernel.org>
 M:      Paolo Bonzini <pbonzini@redhat.com>
@@ -5480,7 +5575,7 @@ F:	drivers/macintosh/
 LINUX FOR POWERPC EMBEDDED MPC5XXX
 M:      Anatolij Gustschin <agust@denx.de>
 L:      linuxppc-dev@lists.ozlabs.org
-T:      git git://git.denx.de/linux-2.6-agust.git
+T:      git git://git.denx.de/linux-denx-agust.git
 S:      Maintained
 F:      arch/powerpc/platforms/512x/
 F:      arch/powerpc/platforms/52xx/
@@ -5594,8 +5689,8 @@ M:	Ingo Molnar <mingo@redhat.com>
 L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking
 S:      Maintained
-F:      Documentation/lockdep*.txt
-F:      Documentation/lockstat.txt
+F:      Documentation/locking/lockdep*.txt
+F:      Documentation/locking/lockstat.txt
 F:      include/linux/lockdep.h
 F:      kernel/locking/
 
@@ -5660,11 +5755,8 @@ T:	git git://github.com/linux-test-project/ltp.git
 S:      Maintained
 
 M32R ARCHITECTURE
-M:      Hirokazu Takata <takata@linux-m32r.org>
-L:      linux-m32r@ml.linux-m32r.org (moderated for non-subscribers)
-L:      linux-m32r-ja@ml.linux-m32r.org (in Japanese)
 W:      http://www.linux-m32r.org/
-S:      Maintained
+S:      Orphan
 F:      arch/m32r/
 
 M68K ARCHITECTURE
@@ -5898,6 +5990,7 @@ L:	linux-mtd@lists.infradead.org
 W:      http://www.linux-mtd.infradead.org/
 Q:      http://patchwork.ozlabs.org/project/linux-mtd/list/
 T:      git git://git.infradead.org/linux-mtd.git
+T:      git git://git.infradead.org/l2-mtd.git
 S:      Maintained
 F:      drivers/mtd/
 F:      include/linux/mtd/
@@ -5915,6 +6008,15 @@ S:	Supported
 F:      drivers/mcb/
 F:      include/linux/mcb.h
 
+MEN F21BMC (Board Management Controller)
+M:      Andreas Werner <andreas.werner@men.de>
+S:      Supported
+F:      drivers/mfd/menf21bmc.c
+F:      drivers/watchdog/menf21bmc_wdt.c
+F:      drivers/leds/leds-menf21bmc.c
+F:      drivers/hwmon/menf21bmc_hwmon.c
+F:      Documentation/hwmon/menf21bmc
+
 METAG ARCHITECTURE
 M:      James Hogan <james.hogan@imgtec.com>
 L:      linux-metag@vger.kernel.org
@@ -6373,7 +6475,7 @@ M:	Lauro Ramos Venancio <lauro.venancio@openbossa.org>
 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)
+L:      linux-nfc@lists.01.org (subscribers-only)
 S:      Supported
 F:      net/nfc/
 F:      include/net/nfc/
@@ -6541,10 +6643,9 @@ S:	Maintained
 F:      drivers/mmc/host/omap.c
 
 OMAP HS MMC SUPPORT
-M:      Balaji T K <balajitk@ti.com>
 L:      linux-mmc@vger.kernel.org
 L:      linux-omap@vger.kernel.org
-S:      Maintained
+S:      Orphan
 F:      drivers/mmc/host/omap_hsmmc.c
 
 OMAP RANDOM NUMBER GENERATOR SUPPORT
@@ -6583,7 +6684,7 @@ F:	arch/arm/*omap*/usb*
 
 OMAP GPIO DRIVER
 M:      Javier Martinez Canillas <javier@dowhile0.org>
-M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Santosh Shilimkar <ssantosh@kernel.org>
 M:      Kevin Hilman <khilman@deeprootsystems.com>
 L:      linux-omap@vger.kernel.org
 S:      Maintained
@@ -6874,14 +6975,29 @@ F:	include/linux/pci*
 F:      arch/x86/pci/
 F:      arch/x86/kernel/quirks.c
 
+PCI DRIVER FOR APPLIEDMICRO XGENE
+M:      Tanmay Inamdar <tinamdar@apm.com>
+L:      linux-pci@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org
+S:      Maintained
+F:      Documentation/devicetree/bindings/pci/xgene-pci.txt
+F:      drivers/pci/host/pci-xgene.c
+
 PCI DRIVER FOR IMX6
 M:      Richard Zhu <r65037@freescale.com>
-M:      Shawn Guo <shawn.guo@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)
 S:      Maintained
 F:      drivers/pci/host/*imx6*
 
+PCI DRIVER FOR TI KEYSTONE
+M:      Murali Karicheri <m-karicheri2@ti.com>
+L:      linux-pci@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/pci/host/*keystone*
+
 PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 M:      Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 M:      Jason Cooper <jason@lakedaemon.net>
@@ -7284,6 +7400,14 @@ T:	git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      drivers/media/usb/pwc/*
 
+PWM FAN DRIVER
+M:      Kamil Debski <k.debski@samsung.com>
+L:      lm-sensors@lm-sensors.org
+S:      Supported
+F:      Documentation/devicetree/bindings/hwmon/pwm-fan.txt
+F:      Documentation/hwmon/pwm-fan
+F:      drivers/hwmon/pwm-fan.c
+
 PWM SUBSYSTEM
 M:      Thierry Reding <thierry.reding@gmail.com>
 L:      linux-pwm@vger.kernel.org
@@ -7297,12 +7421,12 @@ F:	drivers/video/backlight/pwm_bl.c
 F:      include/linux/pwm_backlight.h
 
 PXA2xx/PXA3xx SUPPORT
-M:      Eric Miao <eric.y.miao@gmail.com>
-M:      Russell King <linux@arm.linux.org.uk>
+M:      Daniel Mack <daniel@zonque.org>
 M:      Haojian Zhuang <haojian.zhuang@gmail.com>
+M:      Robert Jarzmik <robert.jarzmik@free.fr>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:      git git://github.com/hzhuang1/linux.git
-T:      git git://git.linaro.org/people/ycmiao/pxa-linux.git
+T:      git git://github.com/rjarzmik/linux.git
 S:      Maintained
 F:      arch/arm/mach-pxa/
 F:      drivers/pcmcia/pxa2xx*
@@ -7379,15 +7503,15 @@ F:	drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 M:      Shahed Shaikh <shahed.shaikh@qlogic.com>
-M:      Dept-HSGLinuxNICDev@qlogic.com
+M:      Dept-GELinuxNICDev@qlogic.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/qlogic/qlcnic/
 
 QLOGIC QLGE 10Gb ETHERNET DRIVER
-M:      Shahed Shaikh <shahed.shaikh@qlogic.com>
-M:      Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
-M:      Ron Mercer <ron.mercer@qlogic.com>
+M:      Harish Patil <harish.patil@qlogic.com>
+M:      Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
+M:      Dept-GELinuxNICDev@qlogic.com
 M:      linux-driver@qlogic.com
 L:      netdev@vger.kernel.org
 S:      Supported
@@ -7490,13 +7614,12 @@ F:	drivers/video/fbdev/aty/aty128fb.c
 
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:      rt2x00 project
-M:      Ivo van Doorn <IvDoorn@gmail.com>
+M:      Stanislaw Gruszka <sgruszka@redhat.com>
 M:      Helmut Schaa <helmut.schaa@googlemail.com>
 L:      linux-wireless@vger.kernel.org
 L:      users@rt2x00.serialmonkey.com (moderated for non-subscribers)
 W:      http://rt2x00.serialmonkey.com/
 S:      Maintained
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git
 F:      drivers/net/wireless/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
@@ -7598,6 +7721,7 @@ F:	fs/reiserfs/
 
 REGISTER MAP ABSTRACTION
 M:      Mark Brown <broonie@kernel.org>
+L:      linux-kernel@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
 S:      Supported
 F:      drivers/base/regmap/
@@ -7866,7 +7990,6 @@ S:	Supported
 F:      drivers/mfd/sec*.c
 F:      drivers/regulator/s2m*.c
 F:      drivers/regulator/s5m*.c
-F:      drivers/rtc/rtc-sec.c
 F:      include/linux/mfd/samsung/
 
 SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
@@ -7937,7 +8060,7 @@ 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:      include/linux/platform_data/dma-dw.h
 F:      drivers/dma/dw/
 
 SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
@@ -8090,6 +8213,8 @@ F:	drivers/mmc/host/sdhci-pltfm.[ch]
 
 SECURE COMPUTING
 M:      Kees Cook <keescook@chromium.org>
+R:      Andy Lutomirski <luto@amacapital.net>
+R:      Will Drewry <wad@chromium.org>
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp
 S:      Supported
 F:      kernel/seccomp.c
@@ -8410,11 +8535,11 @@ S:	Maintained
 F:      Documentation/security/Smack.txt
 F:      security/smack/
 
-SMARTREFLEX DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
+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:      drivers/power/avs/
 F:      include/linux/power/smartreflex.h
 L:      linux-pm@vger.kernel.org
 
@@ -8584,6 +8709,14 @@ F:	include/sound/dmaengine_pcm.h
 F:      sound/core/pcm_dmaengine.c
 F:      sound/soc/soc-generic-dmaengine-pcm.c
 
+SP2 MEDIA DRIVER
+M:      Olli Salonen <olli.salonen@iki.fi>
+L:      linux-media@vger.kernel.org
+W:      http://linuxtv.org/
+Q:      http://patchwork.linuxtv.org/project/linux-media/list/
+S:      Maintained
+F:      drivers/media/dvb-frontends/sp2*
+
 SPARC + UltraSPARC (sparc/sparc64)
 M:      "David S. Miller" <davem@davemloft.net>
 L:      sparclinux@vger.kernel.org
@@ -8695,11 +8828,6 @@ M:	H Hartley Sweeten <hsweeten@visionengravers.com>
 S:      Odd Fixes
 F:      drivers/staging/comedi/
 
-STAGING - ET131X NETWORK DRIVER
-M:      Mark Einon <mark.einon@gmail.com>
-S:      Odd Fixes
-F:      drivers/staging/et131x/
-
 STAGING - FLARION FT1000 DRIVERS
 M:      Marek Belisko <marek.belisko@gmail.com>
 S:      Odd Fixes
@@ -8717,6 +8845,14 @@ W:	http://www.lirc.org/
 S:      Odd Fixes
 F:      drivers/staging/media/lirc/
 
+STAGING - LUSTRE PARALLEL FILESYSTEM
+M:      Oleg Drokin <oleg.drokin@intel.com>
+M:      Andreas Dilger <andreas.dilger@intel.com>
+L:      HPDD-discuss@lists.01.org (moderated for non-subscribers)
+W:      http://lustre.opensfs.org/
+S:      Maintained
+F:      drivers/staging/lustre
+
 STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec)
 M:      Julian Andres Klode <jak@jak-linux.org>
 M:      Marc Dietrich <marvin24@gmx.de>
@@ -9010,17 +9146,13 @@ F:	drivers/media/rc/ttusbir.c
 TEGRA ARCHITECTURE SUPPORT
 M:      Stephen Warren <swarren@wwwdotorg.org>
 M:      Thierry Reding <thierry.reding@gmail.com>
+M:      Alexandre Courbot <gnurou@gmail.com>
 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/tegra/linux.git
 S:      Supported
 N:      [^a-z]tegra
 
-TEGRA ASOC DRIVER
-M:      Stephen Warren <swarren@wwwdotorg.org>
-S:      Supported
-F:      sound/soc/tegra/
-
 TEGRA CLOCK DRIVER
 M:      Peter De Schrijver <pdeschrijver@nvidia.com>
 M:      Prashant Gaikwad <pgaikwad@nvidia.com>
@@ -9032,11 +9164,6 @@ M:	Laxman Dewangan <ldewangan@nvidia.com>
 S:      Supported
 F:      drivers/dma/tegra20-apb-dma.c
 
-TEGRA GPIO DRIVER
-M:      Stephen Warren <swarren@wwwdotorg.org>
-S:      Supported
-F:      drivers/gpio/gpio-tegra.c
-
 TEGRA I2C DRIVER
 M:      Laxman Dewangan <ldewangan@nvidia.com>
 S:      Supported
@@ -9053,11 +9180,6 @@ M:	Laxman Dewangan <ldewangan@nvidia.com>
 S:      Supported
 F:      drivers/input/keyboard/tegra-kbc.c
 
-TEGRA PINCTRL DRIVER
-M:      Stephen Warren <swarren@wwwdotorg.org>
-S:      Supported
-F:      drivers/pinctrl/pinctrl-tegra*
-
 TEGRA PWM DRIVER
 M:      Thierry Reding <thierry.reding@gmail.com>
 S:      Supported
@@ -9148,6 +9270,15 @@ F:	drivers/misc/tifm*
 F:      drivers/mmc/host/tifm_sd.c
 F:      include/linux/tifm.h
 
+TI KEYSTONE MULTICORE NAVIGATOR DRIVERS
+M:      Santosh Shilimkar <ssantosh@kernel.org>
+L:      linux-kernel@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/soc/ti/*
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
+
+
 TI LM49xxx FAMILY ASoC CODEC DRIVERS
 M:      M R Swami Reddy <mr.swami.reddy@ti.com>
 M:      Vishwas A Deshpande <vishwas.a.deshpande@ti.com>
@@ -9289,6 +9420,14 @@ T:	git git://linuxtv.org/media_tree.git
 S:      Odd fixes
 F:      drivers/media/usb/tm6000/
 
+TW68 VIDEO4LINUX 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/pci/tw68/
+
 TPM DEVICE DRIVER
 M:      Peter Huewe <peterhuewe@gmx.de>
 M:      Ashley Lai <ashley@ashleylai.com>
@@ -9310,6 +9449,7 @@ F:	include/*/ftrace.h
 F:      include/linux/trace*.h
 F:      include/trace/
 F:      kernel/trace/
+F:      tools/testing/selftests/ftrace/
 
 TRIVIAL PATCHES
 M:      Jiri Kosina <trivial@kernel.org>
@@ -9683,7 +9823,7 @@ USB WEBCAM GADGET
 M:      Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
-F:      drivers/usb/gadget/function/*uvc*.c
+F:      drivers/usb/gadget/function/*uvc*
 F:      drivers/usb/gadget/legacy/webcam.c
 
 USB WIRELESS RNDIS DRIVER (rndis_wlan)
@@ -9897,6 +10037,7 @@ F:	drivers/scsi/vmw_pvscsi.h
 VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 M:      Liam Girdwood <lgirdwood@gmail.com>
 M:      Mark Brown <broonie@kernel.org>
+L:      linux-kernel@vger.kernel.org
 W:      http://opensource.wolfsonmicro.com/node/15
 W:      http://www.slimlogic.co.uk/?p=48
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
@@ -10156,6 +10297,15 @@ S:	Supported
 F:      drivers/block/xen-blkback/*
 F:      drivers/block/xen*
 
+XEN PVSCSI DRIVERS
+M:      Juergen Gross <jgross@suse.com>
+L:      xen-devel@lists.xenproject.org (moderated for non-subscribers)
+L:      linux-scsi@vger.kernel.org
+S:      Supported
+F:      drivers/scsi/xen-scsifront.c
+F:      drivers/xen/xen-scsiback.c
+F:      include/xen/interface/io/vscsiif.h
+
 XEN SWIOTLB SUBSYSTEM
 M:      Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 L:      xen-devel@lists.xenproject.org (moderated for non-subscribers)
@@ -10180,16 +10330,18 @@ M:	John Linn <John.Linn@xilinx.com>
 S:      Maintained
 F:      drivers/net/ethernet/xilinx/xilinx_axienet*
 
-XILINX SYSTEMACE DRIVER
-S:      Orphan
-F:      drivers/block/xsysace.c
-
 XILINX UARTLITE SERIAL DRIVER
 M:      Peter Korsgaard <jacmet@sunsite.dk>
 L:      linux-serial@vger.kernel.org
 S:      Maintained
 F:      drivers/tty/serial/uartlite.c
 
+XILLYBUS DRIVER
+M:      Eli Billauer <eli.billauer@gmail.com>
+L:      linux-kernel@vger.kernel.org
+S:      Supported
+F:      drivers/char/xillybus/
+
 XTENSA XTFPGA PLATFORM SUPPORT
 M:      Max Filippov <jcmvbkbc@gmail.com>
 L:      linux-xtensa@linux-xtensa.org