Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

Pull audit updates from Paul Moore:
 "Two small patches from the audit next branch; only one of which has
  any real significant code changes, the other is simply a MAINTAINERS
  update for audit.

  The single code patch is pretty small and rather straightforward, it
  changes the audit "version" number reported to userspace from an
  integer to a bitmap which is used to indicate the functionality of the
  running kernel.  This really doesn't have much impact on the kernel,
  but it will make life easier for the audit userspace folks.

  Thankfully we were still on a version number which allowed us to do
  this without breaking userspace"

* 'upstream' of git://git.infradead.org/users/pcmoore/audit:
  audit: convert status version to a feature bitmap
  audit: add Paul Moore to the MAINTAINERS entry

diff --combined MAINTAINERS
index 1f0ef48830f91fb8aa3b2cf6ebeaa6ec61e14102,86c24fd147d1a37c0fc26f4f760c46b01c9a8cba..f273cb58d2e8b1d851becbb7bbe07a5392a5bf9a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -70,8 -70,6 +70,8 @@@ Descriptions of section entries
  
        P: Person (obsolete)
        M: Mail patches to: FullName <address@domain>
 +      R: Designated reviewer: FullName <address@domain>
 +         These reviewers should be CCed on patches.
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
        Q: Patchwork web based patch tracking system site
@@@ -150,15 -148,6 +150,15 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/scsi/53c700*
  
 +6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 +M:    Alexander Aring <[email protected]>
 +M:    Jukka Rissanen <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    net/6lowpan/
 +F:    include/net/6lowpan.h
 +
  6PACK NETWORK DRIVER FOR AX.25
  M:    Andreas Koensgen <[email protected]>
  L:    [email protected]
@@@ -525,16 -514,6 +525,16 @@@ S:       Supporte
  F:    fs/aio.c
  F:    include/linux/*aio*.h
  
 +AIRSPY MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +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/airspy/
 +
  ALCATEL SPEEDTOUCH USB DRIVER
  M:    Duncan Sands <[email protected]>
  L:    [email protected]
@@@ -564,7 -543,7 +564,7 @@@ L: [email protected]
  F:    arch/alpha/
  
  ALTERA TRIPLE SPEED ETHERNET DRIVER
 -M:    Vince Bridgers <vbridgers2013@gmail.com>
 +M:    Vince Bridgers <vbridger@opensource.altera.com>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -598,7 -577,7 +598,7 @@@ AMD GEODE CS5536 USB DEVICE CONTROLLER 
  M:    Thomas Dahlmann <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 -F:    drivers/usb/gadget/amd5536udc.*
 +F:    drivers/usb/gadget/udc/amd5536udc.*
  
  AMD GEODE PROCESSOR/CHIPSET SUPPORT
  P:    Andres Salomon <[email protected]>
@@@ -607,7 -586,7 +607,7 @@@ W: http://www.amd.com/us-en/Connectivit
  S:    Supported
  F:    drivers/char/hw_random/geode-rng.c
  F:    drivers/crypto/geode*
 -F:    drivers/video/geode/
 +F:    drivers/video/fbdev/geode/
  F:    arch/x86/include/asm/geode.h
  
  AMD IOMMU (AMD-VI)
@@@ -622,7 -601,7 +622,7 @@@ AMD MICROCODE UPDATE SUPPOR
  M:    Andreas Herrmann <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    arch/x86/kernel/microcode_amd.c
 +F:    arch/x86/kernel/cpu/microcode/amd*
  
  AMD XGBE DRIVER
  M:    Tom Lendacky <[email protected]>
@@@ -686,17 -665,6 +686,17 @@@ L:       [email protected] (moderat
  W:    http://blackfin.uclinux.org/
  S:    Supported
  F:    sound/soc/blackfin/*
 + 
 +ANALOG DEVICES INC IIO DRIVERS
 +M:    Lars-Peter Clausen <[email protected]>
 +M:    Michael Hennerich <[email protected]>
 +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 <[email protected]>
@@@ -731,13 -699,6 +731,13 @@@ S:       Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 +APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
 +M:    Iyappan Subramanian <[email protected]>
 +M:    Keyur Chudgar <[email protected]>
 +S:    Supported
 +F:    drivers/net/ethernet/apm/xgene/
 +F:    Documentation/devicetree/bindings/net/apm-xgene-enet.txt
 +
  APTINA CAMERA SENSOR PLL
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -754,8 -715,8 +754,8 @@@ F: drivers/ata/pata_arasan_cf.
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <[email protected]>
  S:    Maintained
 -F:    drivers/video/arcfb.c
 -F:    drivers/video/fb_defio.c
 +F:    drivers/video/fbdev/arcfb.c
 +F:    drivers/video/fbdev/core/fb_defio.c
  
  ARM MFM AND FLOPPY DRIVERS
  M:    Ian Molton <[email protected]>
@@@ -794,7 -755,7 +794,7 @@@ F: sound/arm/aaci.
  ARM PRIMECELL CLCD PL110 DRIVER
  M:    Russell King <[email protected]>
  S:    Maintained
 -F:    drivers/video/amba-clcd.*
 +F:    drivers/video/fbdev/amba-clcd.*
  
  ARM PRIMECELL KMI PL050 DRIVER
  M:    Russell King <[email protected]>
@@@ -846,13 -807,6 +846,13 @@@ M:       Emilio López <[email protected]
  S:    Maintained
  F:    drivers/clk/sunxi/
  
 +ARM/Amlogic MesonX SoC support
 +M:    Carlo Caione <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/media/rc/meson-ir.c
 +N:    meson[x68]
 +
  ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
  M:    Andrew Victor <[email protected]>
  M:    Nicolas Ferre <[email protected]>
@@@ -862,7 -816,6 +862,7 @@@ W: http://maxim.org.za/at91_26.htm
  W:    http://www.linux4sam.org
  S:    Supported
  F:    arch/arm/mach-at91/
 +F:    include/soc/at91/
  F:    arch/arm/boot/dts/at91*.dts
  F:    arch/arm/boot/dts/at91*.dtsi
  F:    arch/arm/boot/dts/sama*.dts
@@@ -880,9 -833,10 +880,9 @@@ S:        Maintaine
  F:    arch/arm/mach-highbank/
  
  ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
 -M:    Anton Vorontsov <[email protected]>
 +M:    Krzysztof Halasa <[email protected]>
  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 <[email protected]>
@@@ -937,7 -891,7 +937,7 @@@ L: [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
  S:    Maintained
  F:    arch/arm/mach-prima2/
 -F:    drivers/clk/clk-prima2.c
 +F:    drivers/clk/sirf/
  F:    drivers/clocksource/timer-prima2.c
  F:    drivers/clocksource/timer-marco.c
  N:    [^a-z]sirf
@@@ -982,7 -936,7 +982,7 @@@ F: arch/arm/include/asm/hardware/dec212
  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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1011,14 -965,6 +1011,14 @@@ F:     arch/arm/mach-pxa/hx4700.
  F:    arch/arm/mach-pxa/include/mach/hx4700.h
  F:    sound/soc/pxa/hx4700.c
  
 +ARM/HISILICON SOC SUPPORT
 +M:    Wei Xu <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +W:    http://www.hisilicon.com
 +S:    Supported
 +T:    git git://github.com/hisilicon/linux-hisi.git
 +F:    arch/arm/mach-hisi/
 +
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  M:    Kristoffer Ericson <[email protected]>
  W:    www.jlime.com
@@@ -1043,20 -989,24 +1043,20 @@@ F:    arch/arm/mach-pxa/colibri-pxa270-inc
  
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IOP33X ARM ARCHITECTURE
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Orphan
  
  ARM/INTEL IOP13XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
@@@ -1067,7 -1017,7 +1067,7 @@@ S:      Maintaine
  
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Imre Kaloz <[email protected]>
 -M:    Krzysztof Halasa <kh[email protected].pl>
 +M:    Krzysztof Halasa <khalasa@piap.pl>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-ixp4xx/
@@@ -1081,6 -1031,7 +1081,6 @@@ F:      drivers/pcmcia/pxa2xx_stargate2.
  
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
@@@ -1090,33 -1041,33 +1090,33 @@@ L:   [email protected]
  S:    Maintained
  
  ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
 -M:    Santosh Shilimkar <s[email protected]>
 +M:    Santosh Shilimkar <s[email protected]>
  L:    [email protected] (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 <s[email protected]>
 +M:    Santosh Shilimkar <s[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/clk/keystone/
  
  ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
 -M:    Santosh Shilimkar <s[email protected]>
 +M:    Santosh Shilimkar <s[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
  F:    drivers/clocksource/timer-keystone.c
  
  ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
 -M:    Santosh Shilimkar <s[email protected]>
 +M:    Santosh Shilimkar <s[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/power/reset/keystone-reset.c
  
  ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
 -M:    Santosh Shilimkar <s[email protected]>
 +M:    Santosh Shilimkar <s[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/memory/*emif*
@@@ -1145,13 -1096,14 +1145,13 @@@ L:   [email protected]
  S:    Maintained
  F:    arch/arm/mach-berlin/
  
 -ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
 +ARM/Marvell Dove/MV78xx0/Orion SOC support
  M:    Jason Cooper <[email protected]>
  M:    Andrew Lunn <[email protected]>
  M:    Sebastian Hesselbarth <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-dove/
 -F:    arch/arm/mach-kirkwood/
  F:    arch/arm/mach-mv78xx0/
  F:    arch/arm/mach-orion5x/
  F:    arch/arm/plat-orion/
@@@ -1163,16 -1115,6 +1163,16 @@@ W:    http://www.digriz.org.uk/ts78xx/kern
  S:    Maintained
  F:    arch/arm/mach-orion5x/ts78xx-*
  
 +ARM/Mediatek SoC support
 +M:    Matthias Brugger <[email protected]>
 +L:    [email protected] (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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1195,7 -1137,6 +1195,7 @@@ M:      Linus Walleij <linus.walleij@linaro.
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-nomadik/
 +F:    drivers/pinctrl/nomadik/
  F:    drivers/i2c/busses/i2c-nomadik.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
  
@@@ -1211,13 -1152,14 +1211,13 @@@ M:   Daniel Walker <[email protected]
  M:    Bryan Huntsman <[email protected]>
  L:    [email protected]
  F:    arch/arm/mach-msm/
 -F:    drivers/video/msm/
 +F:    drivers/video/fbdev/msm/
  F:    drivers/mmc/host/msm_sdcc.c
  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/mfd/ssbi/
 -F:    include/linux/mfd/pm8xxx/
 +F:    drivers/mfd/ssbi.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
  S:    Maintained
  
@@@ -1300,39 -1242,42 +1300,39 @@@ F:   drivers/scsi/arm
  ARM/Rockchip SoC support
  M:    Heiko Stuebner <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  S:    Maintained
 +F:    arch/arm/boot/dts/rk3*
  F:    arch/arm/mach-rockchip/
 +F:    drivers/clk/rockchip/
 +F:    drivers/i2c/busses/i2c-rk3x.c
  F:    drivers/*/*rockchip*
 +F:    drivers/*/*/*rockchip*
 +F:    sound/soc/rockchip/
  
 -ARM/SAMSUNG ARM ARCHITECTURES
 -M:    Ben Dooks <[email protected]>
 -M:    Kukjin Kim <[email protected]>
 +ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
 +M:    Kukjin Kim <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
 -W:    http://www.fluff.org/ben/linux/
  S:    Maintained
  F:    arch/arm/boot/dts/s3c*
  F:    arch/arm/boot/dts/exynos*
  F:    arch/arm/plat-samsung/
  F:    arch/arm/mach-s3c24*/
  F:    arch/arm/mach-s3c64xx/
 +F:    arch/arm/mach-s5p*/
 +F:    arch/arm/mach-exynos*/
  F:    drivers/*/*s3c2410*
  F:    drivers/*/*/*s3c2410*
  F:    drivers/spi/spi-s3c*
  F:    sound/soc/samsung/*
 -
 -ARM/S5P EXYNOS ARM ARCHITECTURES
 -M:    Kukjin Kim <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-s5p*/
 -F:    arch/arm/mach-exynos*/
  N:    exynos
  
  ARM/SAMSUNG MOBILE MACHINE SUPPORT
  M:    Kyungmin Park <[email protected]>
  L:    [email protected] (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 <[email protected]>
@@@ -1375,33 -1320,26 +1375,33 @@@ 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
  F:    arch/arm/configs/mackerel_defconfig
  F:    arch/arm/configs/marzen_defconfig
  F:    arch/arm/configs/shmobile_defconfig
 +F:    arch/arm/include/debug/renesas-scif.S
  F:    arch/arm/mach-shmobile/
  F:    drivers/sh/
  
  ARM/SOCFPGA ARCHITECTURE
 -M:    Dinh Nguyen <[email protected]>
 +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 <[email protected]>
 +M:    Dinh Nguyen <dinguyen@opensource.altera.com>
  S:    Maintained
  F:    drivers/clk/socfpga/
  
 +ARM/SOCFPGA EDAC SUPPORT
 +M:    Thor Thayer <[email protected]>
 +S:    Maintained
 +F:    drivers/edac/altera_edac.
 +
  ARM/STI ARCHITECTURE
  M:    Srinivas Kandagatla <[email protected]>
  M:    Maxime Coquelin <[email protected]>
@@@ -1413,18 -1351,11 +1413,18 @@@ S:   Maintaine
  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/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
 +F:    drivers/ata/ahci_st.c
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
@@@ -1455,7 -1386,7 +1455,7 @@@ F:      drivers/mtd/nand/nuc900_nand.
  F:    drivers/rtc/rtc-nuc900.c
  F:    drivers/spi/spi-nuc900.c
  F:    drivers/usb/host/ehci-w90x900.c
 -F:    drivers/video/nuc900fb.c
 +F:    drivers/video/fbdev/nuc900fb.c
  
  ARM/U300 MACHINE SUPPORT
  M:    Linus Walleij <[email protected]>
@@@ -1484,8 -1415,7 +1484,8 @@@ F:      drivers/mfd/abx500
  F:    drivers/mfd/ab8500*
  F:    drivers/mfd/dbx500*
  F:    drivers/mfd/db8500*
 -F:    drivers/pinctrl/pinctrl-nomadik*
 +F:    drivers/pinctrl/nomadik/pinctrl-ab*
 +F:    drivers/pinctrl/nomadik/pinctrl-nomadik*
  F:    drivers/rtc/rtc-ab8500.c
  F:    drivers/rtc/rtc-pl031.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
@@@ -1498,19 -1428,6 +1498,19 @@@ S:    Maintaine
  F:    drivers/clk/ux500/
  F:    include/linux/platform_data/clk-ux500.h
  
 +ARM/VERSATILE EXPRESS PLATFORM
 +M:    Liviu Dudau <[email protected]>
 +M:    Sudeep Holla <[email protected]>
 +M:    Lorenzo Pieralisi <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/boot/dts/vexpress*
 +F:    arch/arm/mach-vexpress/
 +F:    */*/vexpress*
 +F:    */*/*/vexpress*
 +F:    drivers/clk/versatile/clk-vexpress-osc.c
 +F:    drivers/clocksource/versatile.c
 +
  ARM/VFP SUPPORT
  M:    Russell King <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1538,9 -1455,9 +1538,9 @@@ F:      drivers/rtc/rtc-vt8500.
  F:    drivers/tty/serial/vt8500_serial.c
  F:    drivers/usb/host/ehci-platform.c
  F:    drivers/usb/host/uhci-platform.c
 -F:    drivers/video/vt8500lcdfb.*
 -F:    drivers/video/wm8505fb*
 -F:    drivers/video/wmt_ge_rops.*
 +F:    drivers/video/fbdev/vt8500lcdfb.*
 +F:    drivers/video/fbdev/wm8505fb*
 +F:    drivers/video/fbdev/wmt_ge_rops.*
  
  ARM/ZIPIT Z2 SUPPORT
  M:    Marek Vasut <[email protected]>
@@@ -1551,14 -1468,12 +1551,14 @@@ F:   arch/arm/mach-pxa/include/mach/z2.
  
  ARM/ZYNQ ARCHITECTURE
  M:    Michal Simek <[email protected]>
 +R:    Sören Brinkmann <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  W:    http://wiki.xilinx.com
  T:    git git://git.xilinx.com/linux-xlnx.git
  S:    Supported
  F:    arch/arm/mach-zynq/
  F:    drivers/cpuidle/cpuidle-zynq.c
 +F:    drivers/block/xsysace.c
  N:    zynq
  N:    xilinx
  F:    drivers/clocksource/cadence_ttc_timer.c
@@@ -1604,9 -1519,9 +1604,9 @@@ F:      drivers/platform/x86/asus*.
  F:    drivers/platform/x86/eeepc*.c
  
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
 -M:    Dan Williams <[email protected]>
 +R:    Dan Williams <[email protected]>
  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/
@@@ -1658,7 -1573,6 +1658,7 @@@ L:      [email protected]
  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 <[email protected]>
@@@ -1708,12 -1622,6 +1708,12 @@@ M:    Nicolas Ferre <[email protected]
  S:    Supported
  F:    drivers/tty/serial/atmel_serial.c
  
 +ATMEL Audio ALSA driver
 +M:    Bo Shen <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    sound/soc/atmel
 +
  ATMEL DMA DRIVER
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1722,13 -1630,6 +1722,13 @@@ F:    drivers/dma/at_hdmac.
  F:    drivers/dma/at_hdmac_regs.h
  F:    include/linux/platform_data/dma-atmel.h
  
 +ATMEL XDMA DRIVER
 +M:    Ludovic Desroches <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/dma/at_xdmac.c
 +
  ATMEL I2C DRIVER
  M:    Ludovic Desroches <[email protected]>
  L:    [email protected]
@@@ -1746,7 -1647,7 +1746,7 @@@ ATMEL LCDFB DRIVE
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/atmel_lcdfb.c
 +F:    drivers/video/fbdev/atmel_lcdfb.c
  F:    include/video/atmel_lcdc.h
  
  ATMEL MACB ETHERNET DRIVER
@@@ -1754,24 -1655,11 +1754,24 @@@ M:   Nicolas Ferre <[email protected]
  S:    Supported
  F:    drivers/net/ethernet/cadence/
  
 +ATMEL NAND DRIVER
 +M:    Josh Wu <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/mtd/nand/atmel_nand*
 +
  ATMEL SPI DRIVER
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
  F:    drivers/spi/spi-atmel.*
  
 +ATMEL SSC DRIVER
 +M:    Bo Shen <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/misc/atmel-ssc.c
 +F:    include/linux/atmel-ssc.h
 +
  ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1783,7 -1671,7 +1783,7 @@@ ATMEL USBA UDC DRIVE
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 -F:    drivers/usb/gadget/atmel_usba_udc.*
 +F:    drivers/usb/gadget/udc/atmel_usba_udc.*
  
  ATMEL WIRELESS DRIVER
  M:    Simon Kelley <[email protected]>
@@@ -1801,10 -1689,11 +1801,11 @@@ S:   Supporte
  F:    drivers/scsi/esas2r
  
  AUDIT SUBSYSTEM
+ M:    Paul Moore <[email protected]>
  M:    Eric Paris <[email protected]>
- L:    [email protected] (subscribers-only)
+ L:    [email protected] (moderated for non-subscribers)
  W:    http://people.redhat.com/sgrubb/audit/
- T:    git git://git.infradead.org/users/eparis/audit.git
+ T:    git git://git.infradead.org/users/pcmoore/audit
  S:    Maintained
  F:    include/linux/audit.h
  F:    include/uapi/linux/audit.h
@@@ -1843,7 -1732,7 +1844,7 @@@ F:      include/net/ax25.
  F:    net/ax25/
  
  AZ6007 DVB DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -1877,6 -1766,7 +1878,6 @@@ F:      drivers/net/wireless/b43legacy
  
  BACKLIGHT CLASS/SUBSYSTEM
  M:    Jingoo Han <[email protected]>
 -M:    Bryan Wu <[email protected]>
  M:    Lee Jones <[email protected]>
  S:    Maintained
  F:    drivers/video/backlight/
@@@ -1905,24 -1795,11 +1906,24 @@@ W:   http://bcache.evilpiepirate.or
  S:    Maintained:
  F:    drivers/md/bcache/
  
 +BECEEM BCS200/BCS220-3/BCSM250 WIMAX SUPPORT
 +M: Kevin McKinney <[email protected]>
 +M: Matthias Beyer <[email protected]>
 +L: [email protected]
 +S: Maintained
 +F: drivers/staging/bcm*
 +
  BEFS FILE SYSTEM
  S:    Orphan
  F:    Documentation/filesystems/befs.txt
  F:    fs/befs/
  
 +BECKHOFF CX5020 ETHERCAT MASTER DRIVER
 +M: Dariusz Marcinkiewicz <[email protected]>
 +L: [email protected]
 +S: Maintained
 +F: drivers/net/ethernet/ec_bhf.c
 +
  BFS FILE SYSTEM
  M:    "Tigran A. Aivazian" <[email protected]>
  S:    Maintained
@@@ -2036,13 -1913,6 +2037,13 @@@ S:    Supporte
  F:    drivers/net/bonding/
  F:    include/uapi/linux/if_bonding.h
  
 +BPF (Safe dynamic programs and tools)
 +M:    Alexei Starovoitov <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    kernel/bpf/
 +
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Gary Zambrano <[email protected]>
  L:    [email protected]
@@@ -2056,8 -1926,7 +2057,8 @@@ S:      Supporte
  F:    drivers/net/ethernet/broadcom/genet/
  
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 -M:    Michael Chan <[email protected]>
 +M:    Sony Chacko <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2.*
@@@ -2072,7 -1941,6 +2073,7 @@@ F:      drivers/net/ethernet/broadcom/bnx2x
  BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
  M:    Christian Daudt <[email protected]>
  M:    Matt Porter <[email protected]>
 +M:    Florian Fainelli <[email protected]>
  L:    [email protected]
  T:    git git://github.com/broadcom/mach-bcm
  S:    Maintained
@@@ -2081,26 -1949,20 +2082,26 @@@ F:   arch/arm/boot/dts/bcm113
  F:    arch/arm/boot/dts/bcm216*
  F:    arch/arm/boot/dts/bcm281*
  F:    arch/arm/configs/bcm_defconfig
 -F:    drivers/mmc/host/sdhci_bcm_kona.c
 +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 <[email protected]>
 +M:    Lee Jones <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
 +S:    Maintained
 +N:    bcm2835
 +
 +BROADCOM BCM33XX MIPS ARCHITECTURE
 +M:    Kevin Cernekee <[email protected]>
 +L:    [email protected]
  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*
 +F:    arch/mips/bcm3384/*
 +F:    arch/mips/include/asm/mach-bcm3384/*
 +F:    arch/mips/kernel/*bmips*
  
 -BROADCOM BCM5301X ARM ARCHICTURE
 +BROADCOM BCM5301X ARM ARCHITECTURE
  M:    Hauke Mehrtens <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -2108,45 -1970,8 +2109,45 @@@ F:    arch/arm/mach-bcm/bcm_5301x.
  F:    arch/arm/boot/dts/bcm5301x.dtsi
  F:    arch/arm/boot/dts/bcm470*
  
 +BROADCOM BCM63XX ARM ARCHITECTURE
 +M:    Florian Fainelli <[email protected]>
 +L:    [email protected]
 +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 BCM63XX/BCM33XX UDC DRIVER
 +M:    Kevin Cernekee <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/gadget/udc/bcm63xx_udc.*
 +
 +BROADCOM BCM7XXX ARM ARCHITECTURE
 +M:    Marc Carino <[email protected]>
 +M:    Brian Norris <[email protected]>
 +M:    Gregory Fong <[email protected]>
 +M:    Florian Fainelli <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-bcm/*brcmstb*
 +F:    arch/arm/boot/dts/bcm7*.dts*
 +F:    drivers/bus/brcmstb_gisb.c
 +
 +BROADCOM BMIPS MIPS ARCHITECTURE
 +M:    Kevin Cernekee <[email protected]>
 +M:    Florian Fainelli <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/mips/bmips/*
 +F:    arch/mips/include/asm/mach-bmips/*
 +F:    arch/mips/kernel/*bmips*
 +F:    arch/mips/boot/dts/bcm*.dts*
 +F:    drivers/irqchip/irq-bcm7*
 +F:    drivers/irqchip/irq-brcmstb*
 +
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Nithin Nayak Sujir <nsujir@broadcom.com>
 +M:    Prashant Sreedharan <prashant@broadcom.com>
  M:    Michael Chan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -2163,33 -1988,19 +2164,33 @@@ S:   Supporte
  F:    drivers/net/wireless/brcm80211/
  
  BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 -M:    Eddie Wai <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2fc/
  
  BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 -M:    Eddie Wai <[email protected]>
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2i/
  
 +BROADCOM CYGNUS/IPROC ARM ARCHITECTURE
 +M:    Ray Jui <[email protected]>
 +M:    Scott Branden <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +T:    git git://git.github.com/brcm/linux.git
 +S:    Maintained
 +N:    iproc
 +N:    cygnus
 +N:    bcm9113*
 +N:    bcm9583*
 +N:    bcm583*
 +N:    bcm113*
 +
  BROADCOM KONA GPIO DRIVER
 -M:    Markus Mayer <[email protected]>
 +M:    Ray Jui <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/gpio/gpio-bcm-kona.c
@@@ -2216,7 -2027,7 +2217,7 @@@ S:      Supporte
  F:    drivers/scsi/bfa/
  
  BROCADE BNA 10 GIGABIT ETHERNET DRIVER
 -M:    Rasesh Mody <rmody@brocade.com>
 +M:    Rasesh Mody <rasesh.mody@qlogic.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/brocade/bna/
@@@ -2255,7 -2066,7 +2256,7 @@@ F:      Documentation/filesystems/btrfs.tx
  F:    fs/btrfs/
  
  BTTV VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -2365,14 -2176,6 +2366,14 @@@ F:    security/capability.
  F:    security/commoncap.c
  F:    kernel/capability.c
  
 +CC2520 IEEE-802.15.4 RADIO DRIVER
 +M:    Varka Bhadram <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ieee802154/cc2520.c
 +F:    include/linux/spi/cc2520.h
 +F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
 +
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <[email protected]>
  L:    [email protected]
@@@ -2488,6 -2291,12 +2489,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/cirrus/ep93xx_eth.c
  
 -CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
 -M:    Lennert Buytenhek <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/usb/host/ohci-ep93xx.c
 -
  CIRRUS LOGIC AUDIO CODEC DRIVERS
  M:    Brian Austin <[email protected]>
  M:    Paul Handrigan <[email protected]>
@@@ -2554,13 -2363,6 +2555,13 @@@ F:    fs/coda
  F:    include/linux/coda*.h
  F:    include/uapi/linux/coda*.h
  
 +CODA V4L2 MEM2MEM DRIVER
 +M:    Philipp Zabel <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/media/coda.txt
 +F:    drivers/media/platform/coda/
 +
  COMMON CLK FRAMEWORK
  M:    Mike Turquette <[email protected]>
  L:    [email protected]
@@@ -2576,9 -2378,10 +2577,9 @@@ M:     Steve French <[email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://linux-cifs.samba.org/
 -Q:    http://patchwork.ozlabs.org/project/linux-cifs-client/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
 +T:    git git://git.samba.org/sfrench/cifs-2.6.git
  S:    Supported
 -F:    Documentation/filesystems/cifs.txt
 +F:    Documentation/filesystems/cifs/
  F:    fs/cifs/
  
  COMPACTPCI HOTPLUG CORE
@@@ -2653,7 -2456,7 +2654,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    mm/memcontrol.c
 -F:    mm/page_cgroup.c
 +F:    mm/swap_cgroup.c
  
  CORETEMP HARDWARE MONITORING DRIVER
  M:    Fenghua Yu <[email protected]>
@@@ -2703,16 -2506,6 +2704,16 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/cpuidle/cpuidle-big_little.c
  
 +CPUIDLE DRIVER - ARM EXYNOS
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
 +M:    Daniel Lezcano <[email protected]>
 +M:    Kukjin Kim <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/cpuidle/cpuidle-exynos.c
 +F:    arch/arm/mach-exynos/pm.c
 +
  CPUIDLE DRIVERS
  M:    Rafael J. Wysocki <[email protected]>
  M:    Daniel Lezcano <[email protected]>
@@@ -2729,8 -2522,8 +2730,8 @@@ F:      arch/x86/kernel/cpuid.
  F:    arch/x86/kernel/msr.c
  
  CPU POWER MONITORING SUBSYSTEM
 -M:    Dominik Brodowski <[email protected]>
  M:    Thomas Renninger <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    tools/power/cpupower/
  
@@@ -2780,7 -2573,7 +2781,7 @@@ F:      drivers/net/wireless/cw1200
  
  CX18 VIDEO4LINUX DRIVER
  M:    Andy Walls <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (subscribers-only)
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  W:    http://linuxtv.org
@@@ -2800,7 -2593,7 +2801,7 @@@ F:      drivers/media/common/cx2341x
  F:    include/media/cx2341x*
  
  CX88 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -2825,13 -2618,6 +2826,13 @@@ W:    http://www.chelsio.co
  S:    Supported
  F:    drivers/net/ethernet/chelsio/cxgb3/
  
 +CXGB3 ISCSI DRIVER (CXGB3I)
 +M:      Karen Xie <[email protected]>
 +L:      [email protected]
 +W:      http://www.chelsio.com
 +S:      Supported
 +F:      drivers/scsi/cxgbi/cxgb3i
 +
  CXGB3 IWARP RNIC DRIVER (IW_CXGB3)
  M:    Steve Wise <[email protected]>
  L:    [email protected]
@@@ -2846,13 -2632,6 +2847,13 @@@ W:    http://www.chelsio.co
  S:    Supported
  F:    drivers/net/ethernet/chelsio/cxgb4/
  
 +CXGB4 ISCSI DRIVER (CXGB4I)
 +M:      Karen Xie <[email protected]>
 +L:      [email protected]
 +W:      http://www.chelsio.com
 +S:      Supported
 +F:      drivers/scsi/cxgbi/cxgb4i
 +
  CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
  M:    Steve Wise <[email protected]>
  L:    [email protected]
@@@ -2867,18 -2646,6 +2868,18 @@@ W:    http://www.chelsio.co
  S:    Supported
  F:    drivers/net/ethernet/chelsio/cxgb4vf/
  
 +CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER
 +M:    Ian Munsie <[email protected]>
 +M:    Michael Neuling <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -2891,7 -2658,7 +2892,7 @@@ M:      Russell King <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
 -F:    drivers/video/cyber2000fb.*
 +F:    drivers/video/fbdev/cyber2000fb.*
  
  CYCLADES ASYNC MUX DRIVER
  W:    http://www.cyclades.com/
@@@ -2943,10 -2710,11 +2944,10 @@@ F:   Documentation/networking/dmfe.tx
  F:    drivers/net/ethernet/dec/tulip/dmfe.c
  
  DC390/AM53C974 SCSI driver
 -M:    Kurt Garloff <[email protected]>
 -W:    http://www.garloff.de/kurt/linux/dc390/
 -M:    Guennadi Liakhovetski <[email protected]>
 +M:    Hannes Reinecke <[email protected]>
 +L:    [email protected]
  S:    Maintained
 -F:    drivers/scsi/tmscsim.*
 +F:    drivers/scsi/am53c974.c
  
  DC395x SCSI driver
  M:    Oliver Neukum <[email protected]>
@@@ -3015,7 -2783,6 +3016,7 @@@ F:      drivers/platform/x86/dell-wmi.
  DESIGNWARE USB2 DRD IP DRIVER
  M:    Paul Zimmerman <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
  F:    drivers/usb/dwc2/
  
@@@ -3027,13 -2794,6 +3028,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/usb/dwc3/
  
 +DEVICE COREDUMP (DEV_COREDUMP)
 +M:    Johannes Berg <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/base/devcoredump.c
 +F:    include/linux/devcoredump.h
 +
  DEVICE FREQUENCY (DEVFREQ)
  M:    MyungJoo Ham <[email protected]>
  M:    Kyungmin Park <[email protected]>
@@@ -3098,7 -2858,6 +3099,7 @@@ F:      drivers/staging/dgnc
  DIGI EPCA PCI PRODUCTS
  M:    Lidza Louina <[email protected]>
  M:    Mark Hounschell <[email protected]>
 +M:    Daeseok Youn <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/staging/dgap/
@@@ -3136,7 -2895,7 +3137,7 @@@ M:      Bernie Thompson <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    http://plugable.com/category/projects/udlfb/
 -F:    drivers/video/udlfb.c
 +F:    drivers/video/fbdev/udlfb.c
  F:    include/video/udlfb.h
  F:    Documentation/fb/udlfb.txt
  
@@@ -3154,23 -2913,22 +3155,23 @@@ M:   Sumit Semwal <[email protected]
  S:    Maintained
  L:    [email protected]
  L:    [email protected]
 -L:    [email protected]
 -F:    drivers/base/dma-buf*
 +L:    [email protected] (moderated for non-subscribers)
 +F:    drivers/dma-buf/
  F:    include/linux/dma-buf*
 +F:    include/linux/reservation.h
 +F:    include/linux/*fence.h
  F:    Documentation/dma-buf-sharing.txt
  T:    git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
 -M:    Dan Williams <[email protected]>
  L:    [email protected]
  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)
 +F:    Documentation/dmaengine/
 +T:    git git://git.infradead.org/users/vkoul/slave-dma.git
  
  DME1737 HARDWARE MONITOR DRIVER
  M:    Juerg Haefliger <[email protected]>
@@@ -3186,8 -2944,9 +3187,8 @@@ S:      Supporte
  F:    drivers/acpi/dock.c
  
  DOCUMENTATION
 -M:    Randy Dunlap <[email protected]>
 +M:    Jonathan Corbet <[email protected]>
  L:    [email protected]
 -T:    quilt http://www.infradead.org/~rdunlap/Doc/patches/
  S:    Maintained
  F:    Documentation/
  X:    Documentation/ABI/
@@@ -3251,6 -3010,7 +3252,6 @@@ L:      [email protected]
  T:    git git://people.freedesktop.org/~agd5f/linux
  S:    Supported
  F:    drivers/gpu/drm/radeon/
 -F:    include/drm/radeon*
  F:    include/uapi/drm/radeon*
  
  DRM PANEL DRIVERS
@@@ -3264,7 -3024,7 +3265,7 @@@ F:      include/drm/drm_panel.
  F:    Documentation/devicetree/bindings/panel/
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 -M:    Daniel Vetter <daniel.vetter@ffwll.ch>
 +M:    Daniel Vetter <daniel.vetter@intel.com>
  M:    Jani Nikula <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -3300,17 -3060,6 +3301,17 @@@ F:    include/linux/host1x.
  F:    include/uapi/drm/tegra_drm.h
  F:    Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
  
 +DRM DRIVERS FOR RENESAS
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://people.freedesktop.org/~airlied/linux
 +S:    Supported
 +F:    drivers/gpu/drm/rcar-du/
 +F:    drivers/gpu/drm/shmobile/
 +F:    include/linux/platform_data/rcar-du.h
 +F:    include/linux/platform_data/shmob_drm.h
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
  L:    [email protected]
@@@ -3455,12 -3204,26 +3456,12 @@@ T:   git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/e4000*
  
 -EATA-DMA SCSI DRIVER
 -M:    Michael Neuffer <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/scsi/eata*
 -
  EATA ISA/EISA/PCI SCSI DRIVER
  M:    Dario Ballabio <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/scsi/eata.c
  
 -EATA-PIO SCSI DRIVER
 -M:    Michael Neuffer <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/scsi/eata_pio.*
 -
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -3483,7 -3246,7 +3484,7 @@@ F:      fs/ecryptfs
  EDAC-CORE
  M:    Doug Thompson <[email protected]>
  M:    Borislav Petkov <[email protected]>
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    bluesmoke.sourceforge.net
  S:    Supported
@@@ -3532,7 -3295,7 +3533,7 @@@ S:      Maintaine
  F:    drivers/edac/e7xxx_edac.c
  
  EDAC-GHES
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    bluesmoke.sourceforge.net
  S:    Maintained
@@@ -3560,21 -3323,21 +3561,21 @@@ S:   Maintaine
  F:    drivers/edac/i5000_edac.c
  
  EDAC-I5400
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
  EDAC-I7300
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7300_edac.c
  
  EDAC-I7CORE
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    bluesmoke.sourceforge.net
  S:    Maintained
@@@ -3588,13 -3351,6 +3589,13 @@@ W:    bluesmoke.sourceforge.ne
  S:    Maintained
  F:    drivers/edac/i82975x_edac.c
  
 +EDAC-IE31200
 +M:    Jason Baron <[email protected]>
 +L:    [email protected]
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +F:    drivers/edac/ie31200_edac.c
 +
  EDAC-MPC85XX
  M:    Johannes Thumshirn <[email protected]>
  L:    [email protected]
@@@ -3617,7 -3373,7 +3618,7 @@@ S:      Maintaine
  F:    drivers/edac/r82600_edac.c
  
  EDAC-SBRIDGE
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    bluesmoke.sourceforge.net
  S:    Maintained
@@@ -3635,7 -3391,7 +3636,7 @@@ M:      Matt Fleming <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
  S:    Maintained
 -F:    Documentation/x86/efi-stub.txt
 +F:    Documentation/efi-stub.txt
  F:    arch/ia64/kernel/efi.c
  F:    arch/x86/boot/compressed/eboot.[ch]
  F:    arch/x86/include/asm/efi.h
@@@ -3656,7 -3412,7 +3657,7 @@@ EFIFB FRAMEBUFFER DRIVE
  L:    [email protected]
  M:    Peter Jones <[email protected]>
  S:    Maintained
 -F:    drivers/video/efifb.c
 +F:    drivers/video/fbdev/efifb.c
  
  EFS FILESYSTEM
  W:    http://aeschi.ch.eu.org/efs/
@@@ -3677,7 -3433,7 +3678,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/ibm/ehea/
  
  EM28XX VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -3721,14 -3477,9 +3722,14 @@@ EPSON S1D13XXX FRAMEBUFFER DRIVE
  M:    Kristoffer Ericson <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
 -F:    drivers/video/s1d13xxxfb.c
 +F:    drivers/video/fbdev/s1d13xxxfb.c
  F:    include/video/s1d13xxxfb.h
  
 +ET131X NETWORK DRIVER
 +M:    Mark Einon <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/net/ethernet/agere/
 +
  ETHERNET BRIDGE
  M:    Stephen Hemminger <[email protected]>
  L:    [email protected]
@@@ -3804,7 -3555,7 +3805,7 @@@ M:      Donghwa Lee <[email protected]
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/exynos/exynos_mipi*
 +F:    drivers/video/fbdev/exynos/exynos_mipi*
  F:    include/video/exynos_mipi*
  
  F71805F HARDWARE MONITORING DRIVER
@@@ -3983,7 -3734,7 +3984,7 @@@ FREESCALE DIU FRAMEBUFFER DRIVE
  M:    Timur Tabi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/fsl-diu-fb.*
 +F:    drivers/video/fbdev/fsl-diu-fb.*
  
  FREESCALE DMA DRIVER
  M:    Li Yang <[email protected]>
@@@ -4005,7 -3756,7 +4006,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    include/linux/platform_data/video-imxfb.h
 -F:    drivers/video/imxfb.c
 +F:    drivers/video/fbdev/imxfb.c
  
  FREESCALE SOC FS_ENET DRIVER
  M:    Pantelis Antoniou <[email protected]>
@@@ -4027,7 -3778,7 +4028,7 @@@ M:      Li Yang <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/usb/gadget/fsl*
 +F:    drivers/usb/gadget/udc/fsl*
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  M:    Li Yang <[email protected]>
@@@ -4044,13 -3795,10 +4045,13 @@@ F:   drivers/tty/serial/ucc_uart.
  
  FREESCALE SOC SOUND DRIVERS
  M:    Timur Tabi <[email protected]>
 +M:    Nicolin Chen <[email protected]>
 +M:    Xiubo Li <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
  F:    sound/soc/fsl/fsl*
 +F:    sound/soc/fsl/imx*
  F:    sound/soc/fsl/mpc8610_hpcd.c
  
  FREEVXFS FILESYSTEM
@@@ -4229,12 -3977,6 +4230,12 @@@ F:    Documentation/isdn/README.gigase
  F:    drivers/isdn/gigaset/
  F:    include/uapi/linux/gigaset_dev.h
  
 +GO7007 MPEG CODEC
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/usb/go7007/
 +
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  M:    Alexandre Courbot <[email protected]>
@@@ -4243,8 -3985,7 +4244,8 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/gpio/
  F:    drivers/gpio/
 -F:    include/linux/gpio*
 +F:    include/linux/gpio/
 +F:    include/linux/gpio.h
  F:    include/asm-generic/gpio.h
  
  GRE DEMULTIPLEXER DRIVER
@@@ -4350,16 -4091,6 +4351,16 @@@ L:    [email protected]
  S:    Odd Fixes
  F:    drivers/tty/hvc/
  
 +HACKRF MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Guenter Roeck <[email protected]>
@@@ -4403,16 -4134,15 +4404,16 @@@ S:   Maintaine
  F:    drivers/media/dvb-frontends/hd29l2*
  
  HEWLETT-PACKARD SMART2 RAID DRIVER
 -M:    Chirag Kantharia <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/blockdev/cpqarray.txt
  F:    drivers/block/cpqarray.*
  
  HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
 -M:    "Stephen M. Cameron" <[email protected].com>
 +M:    Don Brace <don.brace@pmcs.com>
  L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/hpsa.txt
  F:    drivers/scsi/hpsa*.[ch]
@@@ -4420,10 -4150,8 +4421,10 @@@ F:    include/linux/cciss*.
  F:    include/uapi/linux/cciss*.h
  
  HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 -M:    Mike Miller <mike.miller@hp.com>
 +M:    Don Brace <don.brace@pmcs.com>
  L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    Documentation/blockdev/cciss.txt
  F:    drivers/block/cciss*
@@@ -4447,7 -4175,7 +4448,7 @@@ M:      Ferenc Bakonyi <[email protected]
  L:    [email protected]
  W:    http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
  S:    Maintained
 -F:    drivers/video/hgafb.c
 +F:    drivers/video/fbdev/hgafb.c
  
  HIBERNATION (aka Software Suspend, aka swsusp)
  M:    "Rafael J. Wysocki" <[email protected]>
@@@ -4477,7 -4205,7 +4478,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Maintained
  F:    Documentation/timers/
 -F:    kernel/hrtimer.c
 +F:    kernel/time/hrtimer.c
  F:    kernel/time/clockevents.c
  F:    kernel/time/tick*.*
  F:    kernel/time/timer_*.c
@@@ -4589,7 -4317,7 +4590,7 @@@ F:      drivers/hv
  F:    drivers/input/serio/hyperv-keyboard.c
  F:    drivers/net/hyperv/
  F:    drivers/scsi/storvsc_drv.c
 -F:    drivers/video/hyperv_fb.c
 +F:    drivers/video/fbdev/hyperv_fb.c
  F:    include/linux/hyperv.h
  F:    tools/hv/
  
@@@ -4663,12 -4391,6 +4664,12 @@@ F:    include/linux/i2c-*.
  F:    include/uapi/linux/i2c.h
  F:    include/uapi/linux/i2c-*.h
  
 +I2C ACPI SUPPORT
 +M:    Mika Westerberg <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +
  I2C-TAOS-EVM DRIVER
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
@@@ -4709,7 -4431,7 +4710,7 @@@ S:      Supporte
  F:    drivers/crypto/nx/
  
  IBM Power 842 compression accelerator
 -M:    Nathan Fontenot <[email protected].ibm.com>
 +M:    Dan Streetman <ddstreet@us.ibm.com>
  S:    Supported
  F:    drivers/crypto/nx/nx-842.c
  F:    include/linux/nx842.h
@@@ -4739,7 -4461,10 +4740,7 @@@ S:     Supporte
  F:    drivers/scsi/ibmvscsi/ibmvfc*
  
  IBM ServeRAID RAID DRIVER
 -P:    Jack Hammer
 -M:    Dave Jeffery <[email protected]>
 -W:    http://www.developer.ibm.com/welcome/netfinity/serveraid.html
 -S:    Supported
 +S:    Orphan
  F:    drivers/scsi/ips.*
  
  ICH LPC AND GPIO DRIVER
@@@ -4787,27 -4512,13 +4788,27 @@@ F:   drivers/idle/i7300_idle.
  
  IEEE 802.15.4 SUBSYSTEM
  M:    Alexander Aring <[email protected]>
 -L:    linux-[email protected] (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-[email protected]
 +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:    include/linux/nl802154.h
 +F:    include/linux/ieee802154.h
 +F:    include/net/nl802154.h
 +F:    include/net/mac802154.h
 +F:    include/net/af_ieee802154.h
 +F:    include/net/cfg802154.h
 +F:    include/net/ieee802154_netdev.h
 +F:    Documentation/networking/ieee802154.txt
 +
 +IGORPLUG-USB IR RECEIVER
 +M:    Sean Young <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/rc/igorplugusb.c
  
  IGUANAWORKS USB IR TRANSCEIVER
  M:    Sean Young <[email protected]>
@@@ -4817,14 -4528,10 +4818,14 @@@ F:   drivers/media/rc/iguanair.
  
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <[email protected]>
 +R:    Hartmut Knaack <[email protected]>
 +R:    Lars-Peter Clausen <[email protected]>
 +R:    Peter Meerwald <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/iio/
  F:    drivers/staging/iio/
 +F:    include/linux/iio/
  
  IKANOS/ADI EAGLE ADSL USB DRIVER
  M:    Matthieu Castet <[email protected]>
@@@ -4866,15 -4573,10 +4867,15 @@@ L:   [email protected]
  S:    Supported
  F:    security/integrity/ima/
  
 +IMGTEC IR DECODER DRIVER
 +M:    James Hogan <[email protected]>
 +S:    Maintained
 +F:    drivers/media/rc/img-ir/
 +
  IMS TWINTURBO FRAMEBUFFER DRIVER
  L:    [email protected]
  S:    Orphan
 -F:    drivers/video/imsttfb.c
 +F:    drivers/video/fbdev/imsttfb.c
  
  INFINIBAND SUBSYSTEM
  M:    Roland Dreier <[email protected]>
@@@ -4941,13 -4643,13 +4942,13 @@@ M:   Maik Broemme <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/fb/intelfb.txt
 -F:    drivers/video/intelfb/
 +F:    drivers/video/fbdev/intelfb/
  
  INTEL 810/815 FRAMEBUFFER DRIVER
  M:    Antonino Daplas <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/i810/
 +F:    drivers/video/fbdev/i810/
  
  INTEL MENLOW THERMAL DRIVER
  M:    Sujith Thomas <[email protected]>
@@@ -4959,12 -4661,12 +4960,12 @@@ F:   drivers/platform/x86/intel_menlow.
  INTEL IA32 MICROCODE UPDATE SUPPORT
  M:    Tigran Aivazian <[email protected]>
  S:    Maintained
 -F:    arch/x86/kernel/microcode_core.c
 -F:    arch/x86/kernel/microcode_intel.c
 +F:    arch/x86/kernel/cpu/microcode/core*
 +F:    arch/x86/kernel/cpu/microcode/intel*
  
  INTEL I/OAT DMA DRIVER
 -M:    Dan Williams <[email protected]>
  M:    Dave Jiang <[email protected]>
 +R:    Dan Williams <[email protected]>
  L:    [email protected]
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Supported
@@@ -4979,12 -4681,12 +4980,12 @@@ F:   drivers/iommu/intel-iommu.
  F:    include/linux/intel-iommu.h
  
  INTEL IOP-ADMA DMA DRIVER
 -M:    Dan Williams <[email protected]>
 +R:    Dan Williams <[email protected]>
  S:    Odd fixes
  F:    drivers/dma/iop-adma.c
  
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 -M:    Krzysztof Halasa <kh[email protected].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
@@@ -4998,14 -4700,14 +4999,14 @@@ M:   Deepak Saxena <[email protected]
  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 <[email protected]>
  M:    Jesse Brandeburg <[email protected]>
  M:    Bruce Allan <[email protected]>
  M:    Carolyn Wyborny <[email protected]>
  M:    Don Skidmore <[email protected]>
  M:    Greg Rose <[email protected]>
 -M:    Alex Duyck <alexander.h.duy[email protected]>
 +M:    Matthew Vick <matthew.vi[email protected]>
  M:    John Ronciak <[email protected]>
  M:    Mitch Williams <[email protected]>
  M:    Linux NICS <[email protected]>
@@@ -5194,7 -4896,6 +5195,7 @@@ L:      [email protected]
  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)
@@@ -5236,7 -4937,6 +5237,7 @@@ F:      include/scsi/*iscsi
  
  ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
  M:    Or Gerlitz <[email protected]>
 +M:    Sagi Grimberg <[email protected]>
  M:    Roi Dayan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -5281,11 -4981,11 +5282,11 @@@ 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 <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (subscribers-only)
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
  W:    http://www.ivtvdriver.org
@@@ -5367,6 -5067,13 +5368,6 @@@ S:     Maintaine
  F:    Documentation/hwmon/k8temp
  F:    drivers/hwmon/k8temp.c
  
 -KTAP
 -M:    Jovi Zhangwei <[email protected]>
 -W:    http://www.ktap.org
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/ktap/
 -
  KCONFIG
  M:    "Yann E. MORIN" <[email protected]>
  L:    [email protected]
@@@ -5421,6 -5128,7 +5422,6 @@@ L:      [email protected]
  W:    http://nfs.sourceforge.net/
  S:    Supported
  F:    fs/nfsd/
 -F:    include/linux/nfsd/
  F:    include/uapi/linux/nfsd/
  F:    fs/lockd/
  F:    fs/nfs_common/
@@@ -5429,13 -5137,6 +5430,13 @@@ F:    include/linux/lockd
  F:    include/linux/sunrpc/
  F:    include/uapi/linux/sunrpc/
  
 +KERNEL SELFTEST FRAMEWORK
 +M:    Shuah Khan <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/shuah/linux-kselftest
 +S:    Maintained
 +F:    tools/testing/selftests
 +
  KERNEL VIRTUAL MACHINE (KVM)
  M:    Gleb Natapov <[email protected]>
  M:    Paolo Bonzini <[email protected]>
@@@ -5682,7 -5383,6 +5683,7 @@@ F:      arch/powerpc/boot/rs6000.
  LINUX FOR POWERPC (32-BIT AND 64-BIT)
  M:    Benjamin Herrenschmidt <[email protected]>
  M:    Paul Mackerras <[email protected]>
 +M:    Michael Ellerman <[email protected]>
  W:    http://www.penguinppc.org/
  L:    [email protected]
  Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
@@@ -5702,7 -5402,7 +5703,7 @@@ F:      drivers/macintosh
  LINUX FOR POWERPC EMBEDDED MPC5XXX
  M:    Anatolij Gustschin <[email protected]>
  L:    [email protected]
 -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/
@@@ -5724,17 -5424,16 +5725,17 @@@ F:   arch/powerpc/*/*/*virtex
  
  LINUX FOR POWERPC EMBEDDED PPC8XX
  M:    Vitaly Bordug <[email protected]>
 -M:    Marcelo Tosatti <[email protected]>
  W:    http://www.penguinppc.org/
  L:    [email protected]
  S:    Maintained
  F:    arch/powerpc/platforms/8xx/
  
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 +M:    Scott Wood <[email protected]>
  M:    Kumar Gala <[email protected]>
  W:    http://www.penguinppc.org/
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
  S:    Maintained
  F:    arch/powerpc/platforms/83xx/
  F:    arch/powerpc/platforms/85xx/
@@@ -5816,8 -5515,8 +5817,8 @@@ M:      Ingo Molnar <[email protected]
  L:    [email protected]
  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/
  
@@@ -5882,8 -5581,11 +5883,8 @@@ T:     git git://github.com/linux-test-proj
  S:    Maintained
  
  M32R ARCHITECTURE
 -M:    Hirokazu Takata <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected] (in Japanese)
  W:    http://www.linux-m32r.org/
 -S:    Maintained
 +S:    Orphan
  F:    arch/m32r/
  
  M68K ARCHITECTURE
@@@ -5954,6 -5656,16 +5955,6 @@@ F:     Documentation/networking/mac80211-in
  F:    include/net/mac80211.h
  F:    net/mac80211/
  
 -MAC80211 PID RATE CONTROL
 -M:    Stefano Brivio <[email protected]>
 -M:    Mattias Nissler <[email protected]>
 -L:    [email protected]
 -W:    http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 -S:    Maintained
 -F:    net/mac80211/rc80211_pid*
 -
  MACVLAN DRIVER
  M:    Patrick McHardy <[email protected]>
  L:    [email protected]
@@@ -5961,14 -5673,6 +5962,14 @@@ S:    Maintaine
  F:    drivers/net/macvlan.c
  F:    include/linux/if_macvlan.h
  
 +MAILBOX API
 +M:    Jassi Brar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mailbox/
 +F:    include/linux/mailbox_client.h
 +F:    include/linux/mailbox_controller.h
 +
  MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
  M:    Michael Kerrisk <[email protected]>
  W:    http://www.kernel.org/doc/man-pages
@@@ -5980,11 -5684,6 +5981,11 @@@ M:    Russell King <[email protected]
  S:    Maintained
  F:    drivers/gpu/drm/armada/
  
 +MARVELL 88E6352 DSA support
 +M:    Guenter Roeck <[email protected]>
 +S:    Maintained
 +F:    drivers/net/dsa/mv88e6352.c
 +
  MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
  M:    Mirko Lindner <[email protected]>
  M:    Stephen Hemminger <[email protected]>
@@@ -6011,8 -5710,7 +6012,8 @@@ S:      Maintaine
  F:    drivers/net/ethernet/marvell/mvneta.*
  
  MARVELL MWIFIEX WIRELESS DRIVER
 -M:    Bing Zhao <[email protected]>
 +M:    Amitkumar Karwar <[email protected]>
 +M:    Avinash Patil <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/mwifiex/
@@@ -6031,7 -5729,7 +6032,7 @@@ F:      drivers/mmc/host/mvsdio.
  MATROX FRAMEBUFFER DRIVER
  L:    [email protected]
  S:    Orphan
 -F:    drivers/video/matrox/matroxfb_*
 +F:    drivers/video/fbdev/matrox/matroxfb_*
  F:    include/uapi/linux/matroxfb.h
  
  MAX16065 HARDWARE MONITOR DRIVER
@@@ -6066,7 -5764,7 +6067,7 @@@ S:      Maintaine
  F:    drivers/media/radio/radio-maxiradio*
  
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  P:    LinuxTV.org Project
  L:    [email protected]
  W:    http://linuxtv.org
@@@ -6095,13 -5793,10 +6096,13 @@@ W:   http://linuxtv.or
  S:    Odd Fixes
  F:    drivers/media/parport/pms*
  
 -MEGARAID SCSI DRIVERS
 -M:    Neela Syam Kolli <[email protected]>
 +MEGARAID SCSI/SAS DRIVERS
 +M:    Kashyap Desai <[email protected]>
 +M:    Sumit Saxena <[email protected]>
 +M:    Uday Lingala <[email protected]>
 +L:    [email protected]
  L:    [email protected]
 -W:    http://megaraid.lsilogic.com
 +W:    http://www.lsi.com
  S:    Maintained
  F:    Documentation/scsi/megaraid.txt
  F:    drivers/scsi/megaraid.*
@@@ -6133,7 -5828,6 +6134,7 @@@ L:      [email protected]
  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/
@@@ -6151,15 -5845,6 +6152,15 @@@ S:    Supporte
  F:    drivers/mcb/
  F:    include/linux/mcb.h
  
 +MEN F21BMC (Board Management Controller)
 +M:    Andreas Werner <[email protected]>
 +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 <[email protected]>
  L:    [email protected]
@@@ -6171,6 -5856,7 +6172,6 @@@ F:      drivers/clocksource/metag_generic.
  F:    drivers/irqchip/irq-metag.c
  F:    drivers/irqchip/irq-metag-ext.c
  F:    drivers/tty/metag_da.c
 -F:    fs/imgdafs/
  
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
@@@ -6224,28 -5910,6 +6225,28 @@@ S:    Supporte
  F:    include/linux/mlx5/
  F:    drivers/infiniband/hw/mlx5/
  
 +MN88472 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +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/staging/media/mn88472/
 +F:    drivers/media/dvb-frontends/mn88472.h
 +
 +MN88473 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +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/staging/media/mn88473/
 +F:    drivers/media/dvb-frontends/mn88473.h
 +
  MODULE SUPPORT
  M:    Rusty Russell <[email protected]>
  S:    Maintained
@@@ -6272,12 -5936,6 +6273,12 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/radio/radio-mr800.c
  
 +MRF24J40 IEEE 802.15.4 RADIO DRIVER
 +M:    Alan Ott <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ieee802154/mrf24j40.c
 +
  MSI LAPTOP SUPPORT
  M:    "Lee, Chun-Yi" <[email protected]>
  L:    [email protected]
@@@ -6298,9 -5956,9 +6299,9 @@@ 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/staging/media/msi3101/msi001*
 +F:    drivers/media/tuners/msi001*
  
 -MSI3101 MEDIA DRIVER
 +MSI2500 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
  W:    http://linuxtv.org/
@@@ -6308,7 -5966,7 +6309,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/staging/media/msi3101/sdr-msi3101*
 +F:    drivers/media/usb/msi2500/
  
  MT9M032 APTINA SENSOR DRIVER
  M:    Laurent Pinchart <[email protected]>
@@@ -6345,7 -6003,8 +6346,7 @@@ F:      include/media/mt9v032.
  MULTIFUNCTION DEVICES (MFD)
  M:    Samuel Ortiz <[email protected]>
  M:    Lee Jones <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
  S:    Supported
  F:    drivers/mfd/
  F:    include/linux/mfd/
@@@ -6434,6 -6093,7 +6435,6 @@@ F:      drivers/scsi/g_NCR5380.
  F:    drivers/scsi/g_NCR5380_mmio.c
  F:    drivers/scsi/mac_scsi.*
  F:    drivers/scsi/pas16.*
 -F:    drivers/scsi/sun3_NCR5380.c
  F:    drivers/scsi/sun3_scsi.*
  F:    drivers/scsi/sun3_scsi_vme.c
  F:    drivers/scsi/t128.*
@@@ -6639,7 -6299,7 +6640,7 @@@ M:      Lauro Ramos Venancio <lauro.venancio
  M:    Aloisio Almeida Jr <[email protected]>
  M:    Samuel Ortiz <[email protected]>
  L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (subscribers-only)
  S:    Supported
  F:    net/nfc/
  F:    include/net/nfc/
@@@ -6689,16 -6349,8 +6690,16 @@@ S:    Maintaine
  F:    Documentation/scsi/NinjaSCSI.txt
  F:    drivers/scsi/nsp32*
  
 +NIOS2 ARCHITECTURE
 +M:    Ley Foon Tan <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.rocketboards.org/linux-socfpga.git
 +S:    Maintained
 +F:    arch/nios2/
 +
  NTB DRIVER
 -M:    Jon Mason <[email protected]>
 +M:    Jon Mason <[email protected]>
 +M:    Dave Jiang <[email protected]>
  S:    Supported
  W:    https://github.com/jonmason/ntb/wiki
  T:    git git://github.com/jonmason/ntb.git
@@@ -6719,8 -6371,8 +6720,8 @@@ NVIDIA (rivafb and nvidiafb) FRAMEBUFFE
  M:    Antonino Daplas <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/riva/
 -F:    drivers/video/nvidia/
 +F:    drivers/video/fbdev/riva/
 +F:    drivers/video/fbdev/nvidia/
  
  NVM EXPRESS DRIVER
  M:    Matthew Wilcox <[email protected]>
@@@ -6736,12 -6388,6 +6737,12 @@@ S:    Supporte
  F:    drivers/gpu/drm/i2c/tda998x_drv.c
  F:    include/drm/i2c/tda998x.h
  
 +NXP TFA9879 DRIVER
 +M:    Peter Rosin <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/codecs/tfa9879*
 +
  OMAP SUPPORT
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
@@@ -6752,23 -6398,6 +6753,23 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/arm/*omap*/
  F:    drivers/i2c/busses/i2c-omap.c
 +F:    drivers/irqchip/irq-omap-intc.c
 +F:    drivers/mfd/*omap*.c
 +F:    drivers/mfd/menelaus.c
 +F:    drivers/mfd/palmas.c
 +F:    drivers/mfd/tps65217.c
 +F:    drivers/mfd/tps65218.c
 +F:    drivers/mfd/tps65910.c
 +F:    drivers/mfd/twl-core.[ch]
 +F:    drivers/mfd/twl4030*.c
 +F:    drivers/mfd/twl6030*.c
 +F:    drivers/mfd/twl6040*.c
 +F:    drivers/regulator/palmas-regulator*.c
 +F:    drivers/regulator/pbias-regulator.c
 +F:    drivers/regulator/tps65217-regulator.c
 +F:    drivers/regulator/tps65218-regulator.c
 +F:    drivers/regulator/tps65910-regulator.c
 +F:    drivers/regulator/twl-regulator.c
  F:    include/linux/i2c-omap.h
  
  OMAP DEVICE TREE SUPPORT
@@@ -6779,9 -6408,6 +6780,9 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/arm/boot/dts/*omap*
  F:    arch/arm/boot/dts/*am3*
 +F:    arch/arm/boot/dts/*am4*
 +F:    arch/arm/boot/dts/*am5*
 +F:    arch/arm/boot/dts/*dra7*
  
  OMAP CLOCK FRAMEWORK SUPPORT
  M:    Paul Walmsley <[email protected]>
@@@ -6811,27 -6437,19 +6812,27 @@@ L:   [email protected]
  S:    Maintained
  F:    sound/soc/omap/
  
 +OMAP GENERAL PURPOSE MEMORY CONTROLLER SUPPORT
 +M:    Roger Quadros <[email protected]>
 +M:    Tony Lindgren <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/memory/omap-gpmc.c
 +F:    arch/arm/mach-omap2/*gpmc*
 +
  OMAP FRAMEBUFFER SUPPORT
  M:    Tomi Valkeinen <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/omap/
 +F:    drivers/video/fbdev/omap/
  
  OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
  M:    Tomi Valkeinen <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/omap2/
 +F:    drivers/video/fbdev/omap2/
  F:    Documentation/arm/OMAP/DSS
  
  OMAP HARDWARE SPINLOCK SUPPORT
@@@ -6848,9 -6466,10 +6849,9 @@@ S:     Maintaine
  F:    drivers/mmc/host/omap.c
  
  OMAP HS MMC SUPPORT
 -M:    Balaji T K <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/mmc/host/omap_hsmmc.c
  
  OMAP RANDOM NUMBER GENERATOR SUPPORT
@@@ -6871,12 -6490,11 +6872,12 @@@ L:   [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod_44xx_data.c
  
 -OMAP IMAGE SIGNAL PROCESSOR (ISP)
 +OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/platform/omap3isp/
 +F:    drivers/staging/media/omap4iss/
  
  OMAP USB SUPPORT
  M:    Felipe Balbi <[email protected]>
@@@ -6889,7 -6507,7 +6890,7 @@@ F:      arch/arm/*omap*/usb
  
  OMAP GPIO DRIVER
  M:    Javier Martinez Canillas <[email protected]>
 -M:    Santosh Shilimkar <s[email protected]>
 +M:    Santosh Shilimkar <s[email protected]>
  M:    Kevin Hilman <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -7027,7 -6645,7 +7028,7 @@@ S:      Orpha
  F:    drivers/net/wireless/orinoco/
  
  OSD LIBRARY and FILESYSTEM
 -M:    Boaz Harrosh <bharrosh@panasas.com>
 +M:    Boaz Harrosh <ooo@electrozaur.com>
  M:    Benny Halevy <[email protected]>
  L:    [email protected]
  W:    http://open-osd.org
@@@ -7037,14 -6655,6 +7038,14 @@@ F:    drivers/scsi/osd
  F:    include/scsi/osd_*
  F:    fs/exofs/
  
 +OVERLAY FILESYSTEM
 +M:    Miklos Szeredi <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git
 +S:    Supported
 +F:    fs/overlayfs/
 +F:    Documentation/filesystems/overlayfs.txt
 +
  P54 WIRELESS DRIVER
  M:    Christian Lamparter <[email protected]>
  L:    [email protected]
@@@ -7130,7 -6740,7 +7131,7 @@@ F:      drivers/char/agp/parisc-agp.
  F:    drivers/input/serio/gscps2.c
  F:    drivers/parport/parport_gsc.*
  F:    drivers/tty/serial/8250/8250_gsc.c
 -F:    drivers/video/sti*
 +F:    drivers/video/fbdev/sti*
  F:    drivers/video/console/sti*
  F:    drivers/video/logo/logo_parisc*
  
@@@ -7188,39 -6798,14 +7189,39 @@@ F:   include/linux/pci
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
 +PCI DRIVER FOR APPLIEDMICRO XGENE
 +M:    Tanmay Inamdar <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/xgene-pci.txt
 +F:    drivers/pci/host/pci-xgene.c
 +
 +PCI DRIVER FOR FREESCALE LAYERSCAPE
 +M:    Minghuan Lian <[email protected]>
 +M:    Mingkai Hu <[email protected]>
 +M:    Roy Zang <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pci/host/*layerscape*
 +
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <[email protected]>
 -M:    Shawn Guo <[email protected]>
 +M:    Lucas Stach <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/pci/host/*imx6*
  
 +PCI DRIVER FOR TI KEYSTONE
 +M:    Murali Karicheri <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (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 <[email protected]>
  M:    Jason Cooper <[email protected]>
@@@ -7237,14 -6822,6 +7238,14 @@@ S:    Supporte
  F:    Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
  F:    drivers/pci/host/pci-tegra.c
  
 +PCI DRIVER FOR TI DRA7XX
 +M:    Kishon Vijay Abraham I <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/ti-pci.txt
 +F:    drivers/pci/host/pci-dra7xx.c
 +
  PCI DRIVER FOR RENESAS R-CAR
  M:    Simon Horman <[email protected]>
  L:    [email protected]
@@@ -7275,12 -6852,6 +7276,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
  F:    drivers/pci/host/pci-host-generic.c
  
 +PCIE DRIVER FOR ST SPEAR13XX
 +M:    Mohit Kumar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pci/host/*spear*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
@@@ -7370,13 -6941,12 +7371,13 @@@ M:   Jamie Iles <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://github.com/jamieiles/linux-2.6-ji.git
  S:    Supported
 +F:    arch/arm/boot/dts/picoxcell*
  F:    arch/arm/mach-picoxcell/
 -F:    drivers/*/picoxcell*
 -F:    drivers/*/*/picoxcell*
 +F:    drivers/crypto/picoxcell*
  
  PIN CONTROL SUBSYSTEM
  M:    Linus Walleij <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
@@@ -7385,13 -6955,7 +7386,13 @@@ PIN CONTROLLER - ATMEL AT9
  M:    Jean-Christophe Plagniol-Villard <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/pinctrl/pinctrl-at91.c
 +F:    drivers/pinctrl/pinctrl-at91.*
 +
 +PIN CONTROLLER - INTEL
 +M:    Mika Westerberg <[email protected]>
 +M:    Heikki Krogerus <[email protected]>
 +S:    Maintained
 +F:    drivers/pinctrl/intel/
  
  PIN CONTROLLER - RENESAS
  M:    Laurent Pinchart <[email protected]>
@@@ -7400,12 -6964,14 +7401,12 @@@ S:   Maintaine
  F:    drivers/pinctrl/sh-pfc/
  
  PIN CONTROLLER - SAMSUNG
 -M:    Tomasz Figa <t.figa@samsung.com>
 +M:    Tomasz Figa <tomasz.figa@gmail.com>
  M:    Thomas Abraham <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    drivers/pinctrl/pinctrl-exynos.*
 -F:    drivers/pinctrl/pinctrl-s3c*
 -F:    drivers/pinctrl/pinctrl-samsung.*
 +F:    drivers/pinctrl/samsung/
  
  PIN CONTROLLER - ST SPEAR
  M:    Viresh Kumar <[email protected]>
@@@ -7429,7 -6995,7 +7430,7 @@@ S:      Maintaine
  T:    git git://github.com/gxt/linux.git
  F:    drivers/input/serio/i8042-unicore32io.h
  F:    drivers/i2c/busses/i2c-puv3.c
 -F:    drivers/video/fb-puv3.c
 +F:    drivers/video/fbdev/fb-puv3.c
  F:    drivers/rtc/rtc-puv3.c
  
  PMBUS HARDWARE MONITORING DRIVERS
@@@ -7453,7 -7019,6 +7454,7 @@@ F:      drivers/scsi/pmcraid.
  PMC SIERRA PM8001 DRIVER
  M:    [email protected]
  M:    [email protected]
 +L:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/pm8001/
@@@ -7462,16 -7027,14 +7463,16 @@@ POSIX CLOCKS and TIMER
  M:    Thomas Gleixner <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 -S:    Supported
 +S:    Maintained
  F:    fs/timerfd.c
  F:    include/linux/timer*
 -F:    kernel/*timer*
 +F:    kernel/time/*timer*
  
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 +M:    Sebastian Reichel <[email protected]>
  M:    Dmitry Eremin-Solenikov <[email protected]>
  M:    David Woodhouse <[email protected]>
 +L:    [email protected]
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
  F:    include/linux/power_supply.h
@@@ -7603,7 -7166,7 +7604,7 @@@ F:      drivers/ptp/
  F:    include/linux/ptp_cl*
  
  PTRACE SUPPORT
 -M:    Roland McGrath <roland@redhat.com>
 +M:    Roland McGrath <roland@hack.frob.com>
  M:    Oleg Nesterov <[email protected]>
  S:    Maintained
  F:    include/asm-generic/syscall.h
@@@ -7630,14 -7193,6 +7631,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/pwc/*
  
 +PWM FAN DRIVER
 +M:    Kamil Debski <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected]
@@@ -7651,17 -7206,17 +7652,17 @@@ F:   drivers/video/backlight/pwm_bl.
  F:    include/linux/pwm_backlight.h
  
  PXA2xx/PXA3xx SUPPORT
 -M:    Eric Miao <[email protected]>
 -M:    Russell King <[email protected]>
 +M:    Daniel Mack <[email protected]>
  M:    Haojian Zhuang <[email protected]>
 +M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (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*
  F:    drivers/spi/spi-pxa2xx*
 -F:    drivers/usb/gadget/pxa2*
 +F:    drivers/usb/gadget/udc/pxa2*
  F:    include/sound/pxa2xx-lib.h
  F:    sound/arm/pxa*
  F:    sound/soc/pxa/
@@@ -7670,7 -7225,7 +7671,7 @@@ PXA3xx NAND FLASH DRIVE
  M:    Ezequiel Garcia <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/mtd/nand/pxa3xx-nand.c
 +F:    drivers/mtd/nand/pxa3xx_nand.c
  
  MMP SUPPORT
  M:    Eric Miao <[email protected]>
@@@ -7689,12 -7244,6 +7690,12 @@@ M:    Robert Jarzmik <robert.jarzmik@free.
  L:    [email protected]
  S:    Maintained
  
 +QAT DRIVER
 +M:      Tadeusz Struk <[email protected]>
 +L:      [email protected]
 +S:      Supported
 +F:      drivers/crypto/qat/
 +
  QIB DRIVER
  M:    Mike Marciniszyn <[email protected]>
  L:    [email protected]
@@@ -7733,15 -7282,15 +7734,15 @@@ F:   drivers/net/ethernet/qlogic/qla3xxx.
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
  M:    Shahed Shaikh <[email protected]>
 -M:    Dept-HSG[email protected]
 +M:    Dept-GE[email protected]
  L:    [email protected]
  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 <[email protected]>
 +M:    Harish Patil <harish.patil@qlogic.com>
 +M:    Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
 +M:    [email protected]
  M:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -7818,7 -7367,7 +7819,7 @@@ RADEON FRAMEBUFFER DISPLAY DRIVE
  M:    Benjamin Herrenschmidt <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/aty/radeon*
 +F:    drivers/video/fbdev/aty/radeon*
  F:    include/uapi/linux/radeonfb.h
  
  RADIOSHARK RADIO DRIVER
@@@ -7840,16 -7389,17 +7841,16 @@@ RAGE128 FRAMEBUFFER DISPLAY DRIVE
  M:    Paul Mackerras <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/aty/aty128fb.c
 +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 <[email protected]>
  L:    [email protected]
  L:    [email protected] (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
@@@ -7881,14 -7431,10 +7882,14 @@@ L:   [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/torture.txt
 -F:    kernel/rcu/torture.c
 +F:    kernel/rcu/rcutorture.c
  
  RCUTORTURE TEST FRAMEWORK
  M:    "Paul E. McKenney" <[email protected]>
 +M:    Josh Triplett <[email protected]>
 +R:    Steven Rostedt <[email protected]>
 +R:    Mathieu Desnoyers <[email protected]>
 +R:    Lai Jiangshan <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
@@@ -7911,11 -7457,8 +7912,11 @@@ S:    Supporte
  F:    net/rds/
  
  READ-COPY UPDATE (RCU)
 -M:    Dipankar Sarma <[email protected]>
  M:    "Paul E. McKenney" <[email protected]>
 +M:    Josh Triplett <[email protected]>
 +R:    Steven Rostedt <[email protected]>
 +R:    Mathieu Desnoyers <[email protected]>
 +R:    Lai Jiangshan <[email protected]>
  L:    [email protected]
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
@@@ -7925,7 -7468,7 +7926,7 @@@ X:      Documentation/RCU/torture.tx
  F:    include/linux/rcu*
  X:    include/linux/srcu.h
  F:    kernel/rcu/
 -X:    kernel/rcu/torture.c
 +X:    kernel/torture.c
  
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <[email protected]>
@@@ -7937,13 -7480,6 +7938,13 @@@ F:    drivers/rtc
  F:    include/linux/rtc.h
  F:    include/uapi/linux/rtc.h
  
 +REALTEK AUDIO CODECS
 +M:    Bard Liao <[email protected]>
 +M:    Oder Chiou <[email protected]>
 +S:    Maintained
 +F:    sound/soc/codecs/rt*
 +F:    include/sound/rt*.h
 +
  REISERFS FILE SYSTEM
  L:    [email protected]
  S:    Supported
@@@ -7951,7 -7487,6 +7952,7 @@@ F:      fs/reiserfs
  
  REGISTER MAP ABSTRACTION
  M:    Mark Brown <[email protected]>
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
  S:    Supported
  F:    drivers/base/regmap/
@@@ -8010,13 -7545,6 +8011,13 @@@ F:    drivers/hid/hid-roccat
  F:    include/linux/hid-roccat*
  F:    Documentation/ABI/*/sysfs-driver-hid-roccat*
  
 +ROCKER DRIVER
 +M:    Jiri Pirko <[email protected]>
 +M:    Scott Feldman <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/rocker/
 +
  ROCKETPORT DRIVER
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
@@@ -8061,13 -7589,14 +8062,13 @@@ 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/staging/media/rtl2832u_sdr/rtl2832_sdr*
 +F:    drivers/media/dvb-frontends/rtl2832_sdr*
  
  RTL8180 WIRELESS DRIVER
 -M:    "John W. Linville" <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/wireless/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
@@@ -8094,7 -7623,7 +8095,7 @@@ S3 SAVAGE FRAMEBUFFER DRIVE
  M:    Antonino Daplas <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/savage/
 +F:    drivers/video/fbdev/savage/
  
  S390
  M:    Martin Schwidefsky <[email protected]>
@@@ -8184,7 -7713,7 +8185,7 @@@ S:      Odd Fixe
  F:    drivers/media/i2c/saa6588*
  
  SAA7134 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -8217,7 -7746,7 +8218,7 @@@ SAMSUNG FRAMEBUFFER DRIVE
  M:    Jingoo Han <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/s3c-fb.c
 +F:    drivers/video/fbdev/s3c-fb.c
  
  SAMSUNG MULTIFUNCTION DEVICE DRIVERS
  M:    Sangbeom Kim <[email protected]>
@@@ -8226,6 -7755,7 +8227,6 @@@ S:      Supporte
  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
@@@ -8259,8 -7789,7 +8260,8 @@@ S:      Supporte
  F:    drivers/media/i2c/s5k5baf.c
  
  SAMSUNG SOC CLOCK DRIVERS
 -M:    Tomasz Figa <[email protected]>
 +M:    Sylwester Nawrocki <[email protected]>
 +M:    Tomasz Figa <[email protected]>
  S:    Supported
  L:    [email protected] (moderated for non-subscribers)
  F:    drivers/clk/samsung/
@@@ -8273,19 -7802,6 +8274,19 @@@ S:    Supporte
  L:    [email protected]
  F:    drivers/net/ethernet/samsung/sxgbe/
  
 +SAMSUNG USB2 PHY DRIVER
 +M:    Kamil Debski <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/phy/samsung-phy.txt
 +F:    Documentation/phy/samsung-usb2.txt
 +F:    drivers/phy/phy-exynos4210-usb2.c
 +F:    drivers/phy/phy-exynos4x12-usb2.c
 +F:    drivers/phy/phy-exynos5250-usb2.c
 +F:    drivers/phy/phy-s5pv210-usb2.c
 +F:    drivers/phy/phy-samsung-usb2.c
 +F:    drivers/phy/phy-samsung-usb2.h
 +
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -8296,7 -7812,7 +8297,7 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
  M:    Viresh Kumar <[email protected]>
  M:    Andy Shevchenko <[email protected]>
  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
@@@ -8307,11 -7823,6 +8308,11 @@@ S:    Maintaine
  F:    include/linux/mmc/dw_mmc.h
  F:    drivers/mmc/host/dw_mmc*
  
 +THUNDERBOLT DRIVER
 +M:    Andreas Noever <[email protected]>
 +S:    Maintained
 +F:    drivers/thunderbolt/
 +
  TIMEKEEPING, CLOCKSOURCE CORE, NTP
  M:    John Stultz <[email protected]>
  M:    Thomas Gleixner <[email protected]>
@@@ -8447,18 -7958,6 +8448,18 @@@ S:    Maintaine
  F:    drivers/mmc/host/sdhci.*
  F:    drivers/mmc/host/sdhci-pltfm.[ch]
  
 +SECURE COMPUTING
 +M:    Kees Cook <[email protected]>
 +R:    Andy Lutomirski <[email protected]>
 +R:    Will Drewry <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp
 +S:    Supported
 +F:    kernel/seccomp.c
 +F:    include/uapi/linux/seccomp.h
 +F:    include/linux/seccomp.h
 +K:    \bsecure_computing
 +K:    \bTIF_SECCOMP\b
 +
  SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
  M:    Anton Vorontsov <[email protected]>
  L:    [email protected]
@@@ -8642,7 -8141,7 +8643,7 @@@ S:      Maintaine
  F:    drivers/media/radio/si4713/radio-usb-si4713.c
  
  SIANO DVB DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -8652,14 -8151,6 +8653,14 @@@ F:    drivers/media/usb/siano
  F:    drivers/media/usb/siano/
  F:    drivers/media/mmc/siano/
  
 +SIMPLEFB FB DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/video/simple-framebuffer.txt
 +F:    drivers/video/fbdev/simplefb.c
 +F:    include/linux/platform_data/simplefb.h
 +
  SH_VEU V4L2 MEM2MEM DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -8701,6 -8192,7 +8702,6 @@@ F:      arch/arm/mach-s3c24xx/bast-irq.
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <[email protected]>
  M:    Kevin Hilman <[email protected]>
 -L:    [email protected] (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
@@@ -8710,6 -8202,7 +8711,6 @@@ F:      drivers/i2c/busses/i2c-davinci.
  TI DAVINCI SERIES MEDIA DRIVER
  M:    Lad, Prabhakar <[email protected]>
  L:    [email protected]
 -L:    [email protected] (moderated for non-subscribers)
  W:    http://linuxtv.org/
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
@@@ -8735,7 -8228,7 +8736,7 @@@ M:      Thomas Winischhofer <thomas@winischh
  W:    http://www.winischhofer.net/linuxsisvga.shtml
  S:    Maintained
  F:    Documentation/fb/sisfb.txt
 -F:    drivers/video/sis/
 +F:    drivers/video/fbdev/sis/
  F:    include/video/sisfb.h
  
  SIS USB2VGA DRIVER
@@@ -8758,9 -8251,6 +8759,9 @@@ F:      mm/sl?b
  SLEEPABLE READ-COPY UPDATE (SRCU)
  M:    Lai Jiangshan <[email protected]>
  M:    "Paul E. McKenney" <[email protected]>
 +M:    Josh Triplett <[email protected]>
 +R:    Steven Rostedt <[email protected]>
 +R:    Mathieu Desnoyers <[email protected]>
  L:    [email protected]
  W:    http://www.rdrop.com/users/paulmck/RCU/
  S:    Supported
@@@ -8777,11 -8267,11 +8778,11 @@@ S:   Maintaine
  F:    Documentation/security/Smack.txt
  F:    security/smack/
  
 -SMARTREFLEX DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
 +DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
  M:    Kevin Hilman <[email protected]>
  M:    Nishanth Menon <[email protected]>
  S:    Maintained
 -F:    drivers/power/avs/smartreflex.c
 +F:    drivers/power/avs/
  F:    include/linux/power/smartreflex.h
  L:    [email protected]
  
@@@ -8844,7 -8334,7 +8845,7 @@@ SMSC UFX6000 and UFX7000 USB to VGA DRI
  M:    Steve Glendinning <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/video/smscufx.c
 +F:    drivers/video/fbdev/smscufx.c
  
  SOC-CAMERA V4L2 SUBSYSTEM
  M:    Guennadi Liakhovetski <[email protected]>
@@@ -8860,14 -8350,6 +8861,14 @@@ M:    Chris Boot <[email protected]
  S:    Maintained
  F:    drivers/leds/leds-net48xx.c
  
 +SOFTLOGIC 6x10 MPEG CODEC
 +M:    Bluecherry Maintainers <[email protected]>
 +M:    Andrey Utkin <[email protected]>
 +M:    Andrey Utkin <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/media/pci/solo6x10/
 +
  SOFTWARE RAID (Multiple Disks) SUPPORT
  M:    Neil Brown <[email protected]>
  L:    [email protected]
@@@ -8953,14 -8435,6 +8954,14 @@@ F:    include/sound/dmaengine_pcm.
  F:    sound/core/pcm_dmaengine.c
  F:    sound/soc/soc-generic-dmaengine-pcm.c
  
 +SP2 MEDIA DRIVER
 +M:    Olli Salonen <[email protected]>
 +L:    [email protected]
 +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" <[email protected]>
  L:    [email protected]
@@@ -9066,17 -8540,57 +9067,17 @@@ L:   [email protected]
  S:    Supported
  F:    drivers/staging/
  
 -STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
 -M:    Henk de Groot <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/wlags49_h2/
 -F:    drivers/staging/wlags49_h25/
 -
 -STAGING - ASUS OLED
 -M:    Jakub Schmidtke <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/asus_oled/
 -
  STAGING - COMEDI
  M:    Ian Abbott <[email protected]>
  M:    H Hartley Sweeten <[email protected]>
  S:    Odd Fixes
  F:    drivers/staging/comedi/
  
 -STAGING - CRYSTAL HD VIDEO DECODER
 -M:    Naren Sankar <[email protected]>
 -M:    Jarod Wilson <[email protected]>
 -M:    Scott Davilla <[email protected]>
 -M:    Manu Abraham <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/crystalhd/
 -
 -STAGING - ECHO CANCELLER
 -M:    Steve Underwood <[email protected]>
 -M:    David Rowe <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/echo/
 -
 -STAGING - ET131X NETWORK DRIVER
 -M:    Mark Einon <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/et131x/
 -
  STAGING - FLARION FT1000 DRIVERS
  M:    Marek Belisko <[email protected]>
  S:    Odd Fixes
  F:    drivers/staging/ft1000/
  
 -STAGING - FRONTIER TRANZPORT AND ALPHATRACK
 -M:    David Täht <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/frontier/
 -
 -STAGING - GO7007 MPEG CODEC
 -M:    Hans Verkuil <[email protected]>
 -S:    Maintained
 -F:    drivers/staging/media/go7007/
 -
  STAGING - INDUSTRIAL IO
  M:    Jonathan Cameron <[email protected]>
  L:    [email protected]
@@@ -9089,14 -8603,6 +9090,14 @@@ W:    http://www.lirc.org
  S:    Odd Fixes
  F:    drivers/staging/media/lirc/
  
 +STAGING - LUSTRE PARALLEL FILESYSTEM
 +M:    Oleg Drokin <[email protected]>
 +M:    Andreas Dilger <[email protected]>
 +L:    [email protected] (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 <[email protected]>
  M:    Marc Dietrich <[email protected]>
@@@ -9136,27 -8642,52 +9137,27 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/staging/rtl8723au/
  
 -STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
 -M:    Teddy Wang <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/sm7xxfb/
 -
  STAGING - SLICOSS
  M:    Lior Dotan <[email protected]>
  M:    Christopher Harrer <[email protected]>
  S:    Odd Fixes
  F:    drivers/staging/slicoss/
  
 -STAGING - SOFTLOGIC 6x10 MPEG CODEC
 -M:    Ismael Luceno <[email protected]>
 -S:    Supported
 -F:    drivers/staging/media/solo6x10/
 -
  STAGING - SPEAKUP CONSOLE SPEECH DRIVER
  M:    William Hubbs <[email protected]>
  M:    Chris Brannon <[email protected]>
  M:    Kirk Reiser <[email protected]>
  M:    Samuel Thibault <[email protected]>
 -L:    speakup@braille.uwo.ca
 +L:    speakup@linux-speakup.org
  W:    http://www.linux-speakup.org/
  S:    Odd Fixes
  F:    drivers/staging/speakup/
  
 -STAGING - TI DSP BRIDGE DRIVERS
 -M:    Omar Ramirez Luna <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/tidspbridge/
 -
 -STAGING - USB ENE SM/MS CARD READER DRIVER
 -M:    Al Cho <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/keucr/
 -
  STAGING - VIA VT665X DRIVERS
  M:    Forest Bond <[email protected]>
  S:    Odd Fixes
  F:    drivers/staging/vt665?/
  
 -STAGING - WINBOND IS89C35 WLAN USB DRIVER
 -M:    Pavel Machek <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/staging/winbond/
 -
  STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
  M:    Arnaud Patard <[email protected]>
  S:    Odd Fixes
@@@ -9220,13 -8751,6 +9221,13 @@@ F:    lib/swiotlb.
  F:    arch/*/kernel/pci-swiotlb.c
  F:    include/linux/swiotlb.h
  
 +SWITCHDEV
 +M:    Jiri Pirko <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    net/switchdev/
 +F:    include/net/switchdev.h
 +
  SYNOPSYS ARC ARCHITECTURE
  M:    Vineet Gupta <[email protected]>
  S:    Supported
@@@ -9344,7 -8868,7 +9345,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/tda9840*
  
  TEA5761 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -9352,7 -8876,7 +9353,7 @@@ S:      Odd fixe
  F:    drivers/media/tuners/tea5761.*
  
  TEA5767 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -9397,13 -8921,17 +9398,13 @@@ F:   drivers/media/rc/ttusbir.
  TEGRA ARCHITECTURE SUPPORT
  M:    Stephen Warren <[email protected]>
  M:    Thierry Reding <[email protected]>
 +M:    Alexandre Courbot <[email protected]>
  L:    [email protected]
  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 <[email protected]>
 -S:    Supported
 -F:    sound/soc/tegra/
 -
  TEGRA CLOCK DRIVER
  M:    Peter De Schrijver <[email protected]>
  M:    Prashant Gaikwad <[email protected]>
@@@ -9415,6 -8943,11 +9416,6 @@@ M:     Laxman Dewangan <[email protected]
  S:    Supported
  F:    drivers/dma/tegra20-apb-dma.c
  
 -TEGRA GPIO DRIVER
 -M:    Stephen Warren <[email protected]>
 -S:    Supported
 -F:    drivers/gpio/gpio-tegra.c
 -
  TEGRA I2C DRIVER
  M:    Laxman Dewangan <[email protected]>
  S:    Supported
@@@ -9431,6 -8964,11 +9432,6 @@@ M:     Laxman Dewangan <[email protected]
  S:    Supported
  F:    drivers/input/keyboard/tegra-kbc.c
  
 -TEGRA PINCTRL DRIVER
 -M:    Stephen Warren <[email protected]>
 -S:    Supported
 -F:    drivers/pinctrl/pinctrl-tegra*
 -
  TEGRA PWM DRIVER
  M:    Thierry Reding <[email protected]>
  S:    Supported
@@@ -9507,13 -9045,6 +9508,13 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/thermal/ti-soc-thermal/
  
 +TI CLOCK DRIVER
 +M:    Tero Kristo <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/clk/ti/
 +F:    include/linux/clk/ti.h
 +
  TI FLASH MEDIA INTERFACE DRIVER
  M:    Alex Dubov <[email protected]>
  S:    Maintained
@@@ -9521,15 -9052,6 +9522,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 <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (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 <[email protected]>
  M:    Vishwas A Deshpande <[email protected]>
@@@ -9664,21 -9186,13 +9665,21 @@@ F:   include/linux/shmem_fs.
  F:    mm/shmem.c
  
  TM6000 VIDEO4LINUX DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/usb/tm6000/
  
 +TW68 VIDEO4LINUX DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  M:    Ashley Lai <[email protected]>
@@@ -9700,7 -9214,6 +9701,7 @@@ F:      include/*/ftrace.
  F:    include/linux/trace*.h
  F:    include/trace/
  F:    kernel/trace/
 +F:    tools/testing/selftests/ftrace/
  
  TRIVIAL PATCHES
  M:    Jiri Kosina <[email protected]>
@@@ -9835,6 -9348,7 +9836,6 @@@ F:     drivers/staging/unisys
  
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
  M:    Vinayak Holikatti <[email protected]>
 -M:    Santosh Y <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/ufs.txt
@@@ -9928,6 -9442,11 +9929,6 @@@ S:     Maintaine
  F:    Documentation/hid/hiddev.txt
  F:    drivers/hid/usbhid/
  
 -USB/IP DRIVERS
 -L:    [email protected]
 -S:    Orphan
 -F:    drivers/staging/usbip/
 -
  USB ISP116X DRIVER
  M:    Olav Kongas <[email protected]>
  L:    [email protected]
@@@ -9962,14 -9481,6 +9963,14 @@@ S:    Maintaine
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*
  
 +USB OVER IP DRIVER
 +M:    Valentina Manea <[email protected]>
 +M:    Shuah Khan <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/usbip/
 +F:    tools/usb/usbip/
 +
  USB PEGASUS DRIVER
  M:    Petko Manolov <[email protected]>
  L:    [email protected]
@@@ -10021,6 -9532,15 +10022,6 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/net/usb/smsc95xx.*
  
 -USB SN9C1xx DRIVER
 -M:    Luca Risolia <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -W:    http://www.linux-projects.org
 -S:    Maintained
 -F:    drivers/staging/media/sn9c102/
 -
  USB SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -10068,8 -9588,8 +10069,8 @@@ USB WEBCAM GADGE
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/usb/gadget/*uvc*.c
 -F:    drivers/usb/gadget/webcam.c
 +F:    drivers/usb/gadget/function/*uvc*
 +F:    drivers/usb/gadget/legacy/webcam.c
  
  USB WIRELESS RNDIS DRIVER (rndis_wlan)
  M:    Jussi Kivilinna <[email protected]>
@@@ -10134,7 -9654,7 +10135,7 @@@ L:    [email protected]
  W:    http://dev.gentoo.org/~spock/projects/uvesafb/
  S:    Maintained
  F:    Documentation/fb/uvesafb.txt
 -F:    drivers/video/uvesafb.*
 +F:    drivers/video/fbdev/uvesafb.*
  
  VFAT/FAT/MSDOS FILESYSTEM
  M:    OGAWA Hirofumi <[email protected]>
@@@ -10207,7 -9727,7 +10208,7 @@@ S:    Maintaine
  F:    include/linux/via-core.h
  F:    include/linux/via-gpio.h
  F:    include/linux/via_i2c.h
 -F:    drivers/video/via/
 +F:    drivers/video/fbdev/via/
  
  VIA VELOCITY NETWORK DRIVER
  M:    Francois Romieu <[email protected]>
@@@ -10282,7 -9802,6 +10283,7 @@@ F:    drivers/scsi/vmw_pvscsi.
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
 +L:    [email protected]
  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
@@@ -10341,13 -9860,6 +10342,13 @@@ M:  Pierre Ossman <[email protected]
  S:    Maintained
  F:    drivers/mmc/host/wbsd.*
  
 +WACOM PROTOCOL 4 SERIAL TABLETS
 +M:    Julian Squires <[email protected]>
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/input/tablet/wacom_serial4.c
 +
  WATCHDOG DEVICE DRIVERS
  M:    Wim Van Sebroeck <[email protected]>
  L:    [email protected]
@@@ -10471,9 -9983,9 +10472,9 @@@ F:    Documentation/x86
  F:    arch/x86/
  
  X86 PLATFORM DRIVERS
 -M:    Matthew Garrett <[email protected]>
 +M:    Darren Hart <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
 +T:    git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
  S:    Maintained
  F:    drivers/platform/x86/
  
@@@ -10485,7 -9997,7 +10486,7 @@@ S:    Maintaine
  F:    arch/x86/kernel/cpu/mcheck/*
  
  XC2028/3028 TUNER DRIVER
 -M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
 +M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    [email protected]
  W:    http://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
@@@ -10535,22 -10047,6 +10536,22 @@@ S: Supporte
  F:    arch/x86/pci/*xen*
  F:    drivers/pci/*xen*
  
 +XEN BLOCK SUBSYSTEM
 +M:    Konrad Rzeszutek Wilk <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    drivers/block/xen-blkback/*
 +F:    drivers/block/xen*
 +
 +XEN PVSCSI DRIVERS
 +M:    Juergen Gross <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -10575,18 -10071,16 +10576,18 @@@ M:        John Linn <[email protected]
  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 <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/tty/serial/uartlite.c
  
 +XILLYBUS DRIVER
 +M:    Eli Billauer <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/char/xillybus/
 +
  XTENSA XTFPGA PLATFORM SUPPORT
  M:    Max Filippov <[email protected]>
  L:    [email protected]

diff --combined include/uapi/linux/audit.h
index d4dbef14d4dffa7d4eae071c59674e5a99b66091,2ccf19e06e15f156b8e2aa7ab4c96e44c3a1f20b..12e26683c7061c80e9e6f5f0ba3dbc1a73b32862
--- 1/include/uapi/linux/audit.h
--- 2/include/uapi/linux/audit.h
+++ b/include/uapi/linux/audit.h
@@@ -322,9 -322,15 +322,15 @@@ enum 
  #define AUDIT_STATUS_BACKLOG_LIMIT    0x0010
  #define AUDIT_STATUS_BACKLOG_WAIT_TIME        0x0020
  
- #define AUDIT_VERSION_BACKLOG_LIMIT   1
- #define AUDIT_VERSION_BACKLOG_WAIT_TIME       2
- #define AUDIT_VERSION_LATEST AUDIT_VERSION_BACKLOG_WAIT_TIME
+ #define AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT    0x00000001
+ #define AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME        0x00000002
+ #define AUDIT_FEATURE_BITMAP_ALL (AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | \
+                                 AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME)
+ 
+ /* deprecated: AUDIT_VERSION_* */
+ #define AUDIT_VERSION_LATEST          AUDIT_FEATURE_BITMAP_ALL
+ #define AUDIT_VERSION_BACKLOG_LIMIT   AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT
+ #define AUDIT_VERSION_BACKLOG_WAIT_TIME       AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME
  
                                /* Failure-to-log actions */
  #define AUDIT_FAIL_SILENT     0
@@@ -342,7 -348,6 +348,7 @@@
  #define __AUDIT_ARCH_64BIT 0x80000000
  #define __AUDIT_ARCH_LE          0x40000000
  
 +#define AUDIT_ARCH_AARCH64    (EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
  #define AUDIT_ARCH_ALPHA      (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
  #define AUDIT_ARCH_ARM                (EM_ARM|__AUDIT_ARCH_LE)
  #define AUDIT_ARCH_ARMEB      (EM_ARM)
@@@ -404,7 -409,10 +410,10 @@@ struct audit_status 
        __u32           backlog_limit;  /* waiting messages limit */
        __u32           lost;           /* messages lost */
        __u32           backlog;        /* messages waiting in queue */
-       __u32           version;        /* audit api version number */
+       union {
+               __u32   version;        /* deprecated: audit api version num */
+               __u32   feature_bitmap; /* bitmap of kernel audit features */
+       };
        __u32           backlog_wait_time;/* message queue wait timeout */
  };
  

diff --combined kernel/audit.c
index 1f37f15117e501f554b7ff4f2b734a8119757df3,f3a981db91fff76745f9c4d14c48f6d170c4efae..f8f203e8018c5995b546457342d18f262a2565dc
--- 1/kernel/audit.c
--- 2/kernel/audit.c
+++ b/kernel/audit.c
@@@ -499,6 -499,7 +499,6 @@@ static int kauditd_thread(void *dummy
        set_freezable();
        while (!kthread_should_stop()) {
                struct sk_buff *skb;
 -              DECLARE_WAITQUEUE(wait, current);
  
                flush_hold_queue();
  
@@@ -513,8 -514,16 +513,8 @@@
                                audit_printk_skb(skb);
                        continue;
                }
 -              set_current_state(TASK_INTERRUPTIBLE);
 -              add_wait_queue(&kauditd_wait, &wait);
  
 -              if (!skb_queue_len(&audit_skb_queue)) {
 -                      try_to_freeze();
 -                      schedule();
 -              }
 -
 -              __set_current_state(TASK_RUNNING);
 -              remove_wait_queue(&kauditd_wait, &wait);
 +              wait_event_freezable(kauditd_wait, skb_queue_len(&audit_skb_queue));
        }
        return 0;
  }
@@@ -833,7 -842,7 +833,7 @@@ static int audit_receive_msg(struct sk_
                s.backlog_limit         = audit_backlog_limit;
                s.lost                  = atomic_read(&audit_lost);
                s.backlog               = skb_queue_len(&audit_skb_queue);
-               s.version               = AUDIT_VERSION_LATEST;
+               s.feature_bitmap        = AUDIT_FEATURE_BITMAP_ALL;
                s.backlog_wait_time     = audit_backlog_wait_time;
                audit_send_reply(skb, seq, AUDIT_GET, 0, 0, &s, sizeof(s));
                break;
@@@ -1658,7 -1667,7 +1658,7 @@@ void audit_log_cap(struct audit_buffer 
        audit_log_format(ab, " %s=", prefix);
        CAP_FOR_EACH_U32(i) {
                audit_log_format(ab, "%08x",
 -                               cap->cap[(_KERNEL_CAPABILITY_U32S-1) - i]);
 +                               cap->cap[CAP_LAST_U32 - i]);
        }
  }