ipv4: fix nexthop attlen check in fib_nh_match
[pandora-kernel.git] / MAINTAINERS
index 4c6c341..6dc0840 100644 (file)
@@ -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
 
@@ -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)
@@ -1361,7 +1382,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 +1392,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 +1420,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>
@@ -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)
@@ -2004,6 +2044,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
@@ -2033,6 +2074,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 +2147,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/
@@ -2848,6 +2897,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 +2909,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>
@@ -2989,13 +3046,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
@@ -3019,6 +3074,7 @@ F:        Documentation/
 X:     Documentation/ABI/
 X:     Documentation/devicetree/
 X:     Documentation/[a-z][a-z]_[A-Z][A-Z]/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc.git
 
 DOUBLETALK DRIVER
 M:     "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@ -3550,6 +3606,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
@@ -4595,13 +4656,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>
@@ -4611,6 +4673,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/
@@ -4748,8 +4813,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
@@ -4764,12 +4829,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
@@ -4783,14 +4848,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>
@@ -5478,7 +5543,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/
@@ -6371,7 +6436,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/
@@ -7295,12 +7360,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*
@@ -7377,15 +7442,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
@@ -7488,13 +7553,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
@@ -7596,6 +7660,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/
@@ -8693,11 +8758,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
@@ -8715,6 +8775,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>
@@ -9008,17 +9076,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>
@@ -9030,11 +9094,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
@@ -9051,11 +9110,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
@@ -9146,6 +9200,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 <santosh.shilimkar@ti.com>
+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>
@@ -9681,7 +9744,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)
@@ -10189,6 +10252,12 @@ 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