]> Git Repo - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 664fb23 bdc6e95)
Merge tag 'gpio-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorLinus Torvalds <[email protected]>
Sat, 9 Aug 2014 01:00:35 +0000 (18:00 -0700)
committerLinus Torvalds <[email protected]>
Sat, 9 Aug 2014 01:00:35 +0000 (18:00 -0700)
Pull GPIO update from Linus Walleij:
 "This is the bulk of GPIO changes for the v3.17 development cycle, and
  this time we got a lot of action going on and it will continue:

   - The core GPIO library implementation has been split up in three
     different files:
     - gpiolib.c for the latest and greatest and shiny GPIO library code
       using GPIO descriptors only
     - gpiolib-legacy.c for the old integer number space API that we are
       phasing out gradually
     - gpiolib-sysfs.c for the sysfs interface that we are not entirely
       happy with, but has to live on for ABI compatibility

   - Add a flags argument to *gpiod_get* functions, with some
     backward-compatibility macros to ease transitions.  We should have
     had the flags there from the beginning it seems, now we need to
     clean up the mess.  There is a plan on how to move forward here
     devised by Alexandre Courbot and Mark Brown

   - Split off a special <linux/gpio/machine.h> header for the board
     gpio table registration, as per example from the regulator
     subsystem

   - Start to kill off the return value from gpiochip_remove() by
     removing the __must_check attribute and removing all checks inside
     the drivers/gpio directory.  The rationale is: well what were we
     supposed to do if there is an error code? Not much: print an error
     message.  And gpiolib already does that.  So make this function
     return void eventually

   - Some cleanups of hairy gpiolib code, make some functions not to be
     used outside the library private and make sure they are not
     exported, remove gpiod_lock/unlock_as_irq() as the existing
     function is for driver-internal use and fine as it is, delete
     gpio_ensure_requested() as it is not meaningful anymore

   - Support the GPIOF_ACTIVE_LOW flag from gpio_request_one() function
     calls, which is logical since this is already supported when
     referencing GPIOs from e.g. device trees

   - Switch STMPE, intel-mid, lynxpoint and ACPI (!) to use the gpiolib
     irqchip helpers cutting down on GPIO irqchip boilerplate a bit more

   - New driver for the Zynq GPIO block

   - The usual incremental improvements around a bunch of drivers

   - Janitorial syntactic and semantic cleanups by Jingoo Han, and
     Rickard Strandqvist especially"

* tag 'gpio-v3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (37 commits)
  MAINTAINERS: update GPIO include files
  gpio: add missing includes in machine.h
  gpio: add flags argument to gpiod_get*() functions
  MAINTAINERS: Update Samsung pin control entry
  gpio / ACPI: Move event handling registration to gpiolib irqchip helpers
  gpio: lynxpoint: Convert to use gpiolib irqchip
  gpio: split gpiod board registration into machine header
  gpio: remove gpio_ensure_requested()
  gpio: remove useless check in gpiolib_sysfs_init()
  gpiolib: Export gpiochip_request_own_desc and gpiochip_free_own_desc
  gpio: move gpio_ensure_requested() into legacy C file
  gpio: remove gpiod_lock/unlock_as_irq()
  gpio: make gpiochip_get_desc() gpiolib-private
  gpio: simplify gpiochip_export()
  gpio: remove export of private of_get_named_gpio_flags()
  gpio: Add support for GPIOF_ACTIVE_LOW to gpio_request_one functions
  gpio: zynq: Clear pending interrupt when enabling a IRQ
  gpio: drop retval check enforcing from gpiochip_remove()
  gpio: remove all usage of gpio_remove retval in driver/gpio
  devicetree: Add Zynq GPIO devicetree bindings documentation
  ...

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/arm/mach-tegra/board-paz00.c patch | diff1 | diff2 | blob | history
drivers/gpio/Kconfig patch | diff1 | diff2 | blob | history
drivers/gpio/Makefile patch | diff1 | diff2 | blob | history
drivers/gpio/gpio-mcp23s08.c patch | diff1 | diff2 | blob | history
drivers/gpio/gpio-rcar.c patch | diff1 | diff2 | blob | history

diff --combined MAINTAINERS
index 3bb6df5d9094dc356764641a33639f02dd22e7f5,ef159d0101dc48c00faede2ded7fa4337d108b4d..a0abe7c1a8eab1a2af48d4fd17f516e829e1cbac
--- 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,14 -148,6 +150,14 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/scsi/53c700*
  
 +6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
 +M:    Alexander Aring <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +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]
@@@ -166,6 -156,7 +166,6 @@@ F: drivers/net/hamradio/6pack.
  
  8169 10/100/1000 GIGABIT ETHERNET DRIVER
  M:    Realtek linux nic maintainers <[email protected]>
 -M:    Francois Romieu <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/realtek/r8169.c
@@@ -524,16 -515,6 +524,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]
@@@ -597,7 -578,7 +597,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]>
@@@ -621,7 -602,7 +621,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]>
@@@ -911,7 -892,7 +911,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
@@@ -962,10 -943,16 +962,10 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
  F:    arch/arm/mach-imx/
 +F:    arch/arm/mach-mxs/
  F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
  
 -ARM/FREESCALE MXS ARM ARCHITECTURE
 -M:    Shawn Guo <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 -F:    arch/arm/mach-mxs/
 -
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -985,14 -972,6 +985,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
@@@ -1073,33 -1052,9 +1073,33 @@@ M:    Santosh Shilimkar <santosh.shilimkar
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
 -F:    drivers/clk/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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/clk/keystone/
 +
 +ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
 +M:    Santosh Shilimkar <[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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/power/reset/keystone-reset.c
 +
 +ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/memory/*emif*
 +
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1124,13 -1079,14 +1124,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/
@@@ -1164,7 -1120,6 +1164,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
  
@@@ -1186,7 -1141,8 +1186,7 @@@ F:      drivers/mmc/host/msm_sdcc.
  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
  
@@@ -1340,20 -1296,6 +1340,20 @@@ W:    http://oss.renesas.co
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
 +F:    arch/arm/boot/dts/emev2*
 +F:    arch/arm/boot/dts/r7s*
 +F:    arch/arm/boot/dts/r8a*
 +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/mach-shmobile/
  F:    drivers/sh/
  
@@@ -1383,7 -1325,6 +1383,7 @@@ F:      drivers/pinctrl/pinctrl-st.
  F:    drivers/media/rc/st_rc.c
  F:    drivers/i2c/busses/i2c-st.c
  F:    drivers/tty/serial/st-asc.c
 +F:    drivers/mmc/host/sdhci-st.c
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
@@@ -1443,8 -1384,7 +1443,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
@@@ -1700,7 -1640,7 +1700,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]>
@@@ -1823,13 -1763,6 +1823,13 @@@ 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
@@@ -1948,13 -1881,6 +1948,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]
@@@ -1968,8 -1894,7 +1968,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.*
@@@ -1992,7 -1917,7 +1992,7 @@@ 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
@@@ -2013,16 -1938,8 +2013,16 @@@ F:    arch/arm/mach-bcm/bcm_5301x.
  F:    arch/arm/boot/dts/bcm5301x.dtsi
  F:    arch/arm/boot/dts/bcm470*
  
 +BROADCOM BCM7XXX ARM ARCHITECTURE
 +M:    Marc Carino <[email protected]>
 +M:    Brian Norris <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-bcm/*brcmstb*
 +F:    arch/arm/boot/dts/bcm7*.dts*
 +
  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
@@@ -2039,13 -1956,13 +2039,13 @@@ 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/
@@@ -2342,6 -2259,12 +2342,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]>
@@@ -2426,7 -2349,7 +2426,7 @@@ 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
  S:    Supported
 -F:    Documentation/filesystems/cifs.txt
 +F:    Documentation/filesystems/cifs/
  F:    fs/cifs/
  
  COMPACTPCI HOTPLUG CORE
@@@ -2567,8 -2490,8 +2567,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/
  
@@@ -2903,7 -2826,6 +2903,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/
@@@ -2960,10 -2882,8 +2960,10 @@@ S:    Maintaine
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
 -F:    drivers/base/dma-buf*
 +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
  
@@@ -2997,9 -2917,6 +2997,9 @@@ L:      [email protected]
  T:    quilt http://www.infradead.org/~rdunlap/Doc/patches/
  S:    Maintained
  F:    Documentation/
 +X:    Documentation/ABI/
 +X:    Documentation/devicetree/
 +X:    Documentation/[a-z][a-z]_[A-Z][A-Z]/
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <[email protected]>
@@@ -3058,6 -2975,7 +3058,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
@@@ -3251,12 -3169,34 +3251,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.*
 -
 -EBTABLES
 -L:    [email protected]
 -W:    http://ebtables.sourceforge.net/
 -S:    Orphan
 -F:    include/linux/netfilter_bridge/ebt_*.h
 -F:    include/uapi/linux/netfilter_bridge/ebt_*.h
 -F:    net/bridge/netfilter/ebt*.c
 -
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -3384,13 -3324,6 +3384,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]
@@@ -3431,7 -3364,7 +3431,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
@@@ -3818,7 -3751,7 +3818,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]>
@@@ -4017,12 -3950,6 +4017,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]>
@@@ -4031,7 -3958,8 +4031,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
@@@ -4251,7 -4179,7 +4252,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
@@@ -4507,7 -4435,10 +4508,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
@@@ -4554,7 -4485,8 +4555,7 @@@ S:      Supporte
  F:    drivers/idle/i7300_idle.c
  
  IEEE 802.15.4 SUBSYSTEM
 -M:    Alexander Smirnov <[email protected]>
 -M:    Dmitry Eremin-Solenikov <[email protected]>
 +M:    Alexander Aring <[email protected]>
  L:    [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
@@@ -4704,8 -4636,8 +4705,8 @@@ 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]>
@@@ -5110,6 -5042,13 +5111,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]
@@@ -5164,6 -5103,7 +5165,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/
@@@ -5418,7 -5358,6 +5419,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/
@@@ -5460,17 -5399,16 +5461,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/
@@@ -5580,11 -5518,10 +5581,11 @@@ S:   Maintaine
  F:    arch/arm/mach-lpc32xx/
  
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 -M:    Nagalakshmi Nandigama <[email protected]>
 -M:    Sreekanth Reddy <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 +M:    Nagalakshmi Nandigama <[email protected]>
 +M:    Praveen Krishnamoorthy <[email protected]>
 +M:    Sreekanth Reddy <[email protected]>
 +M:    Abhijit Mahajan <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  W:    http://www.lsilogic.com/support
  S:    Supported
@@@ -5693,6 -5630,16 +5694,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]
@@@ -5737,8 -5684,7 +5738,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/
@@@ -5884,6 -5830,7 +5885,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]>
@@@ -5983,9 -5930,9 +5984,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/
@@@ -5993,7 -5940,7 +5994,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]>
@@@ -6030,7 -5977,8 +6031,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/
@@@ -6158,11 -6106,12 +6159,11 @@@ F:   Documentation/networking/s2io.tx
  F:    Documentation/networking/vxge.txt
  F:    drivers/net/ethernet/neterion/
  
 -NETFILTER/IPTABLES
 +NETFILTER ({IP,IP6,ARP,EB,NF}TABLES)
  M:    Pablo Neira Ayuso <[email protected]>
  M:    Patrick McHardy <[email protected]>
  M:    Jozsef Kadlecsik <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  L:    [email protected]
  W:    http://www.netfilter.org/
  W:    http://www.iptables.org/
@@@ -6516,12 -6465,11 +6517,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]>
@@@ -6827,7 -6775,7 +6828,7 @@@ F:      arch/x86/kernel/quirks.
  
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <[email protected]>
 -M:    Shawn Guo <shawn.guo@linaro.org>
 +M:    Shawn Guo <shawn.guo@freescale.com>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -6879,12 -6827,6 +6880,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]
@@@ -6974,9 -6916,9 +6975,9 @@@ 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]>
@@@ -6990,21 -6932,13 +6991,19 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/pinctrl/pinctrl-at91.c
  
 +PIN CONTROLLER - RENESAS
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pinctrl/sh-pfc/
 +
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
  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]>
@@@ -7025,7 -6959,7 +7024,7 @@@ PKUNITY SOC DRIVER
  M:    Guan Xuetao <[email protected]>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
 +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
@@@ -7060,16 -6994,14 +7059,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
@@@ -7201,7 -7133,7 +7200,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
@@@ -7251,7 -7183,7 +7250,7 @@@ S:      Maintaine
  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/
@@@ -7260,7 -7192,7 +7259,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]>
@@@ -7279,12 -7211,6 +7278,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]
@@@ -7466,20 -7392,16 +7465,20 @@@ S:   Orpha
  F:    drivers/net/wireless/ray*
  
  RCUTORTURE MODULE
 -M:    Josh Triplett <josh@freedesktop.org>
 +M:    Josh Triplett <josh@joshtriplett.org>
  M:    "Paul E. McKenney" <[email protected]>
  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
@@@ -7502,11 -7424,8 +7501,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
@@@ -7516,7 -7435,7 +7515,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]>
@@@ -7528,13 -7447,6 +7527,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
@@@ -7644,7 -7556,7 +7643,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/rtl2832u_sdr/rtl2832_sdr*
 +F:    drivers/media/dvb-frontends/rtl2832_sdr*
  
  RTL8180 WIRELESS DRIVER
  M:    "John W. Linville" <[email protected]>
@@@ -7878,11 -7790,6 +7877,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]>
@@@ -8018,16 -7925,6 +8017,16 @@@ S:    Maintaine
  F:    drivers/mmc/host/sdhci.*
  F:    drivers/mmc/host/sdhci-pltfm.[ch]
  
 +SECURE COMPUTING
 +M:    Kees Cook <[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]
@@@ -8050,7 -7947,6 +8049,7 @@@ F:      drivers/mmc/host/sdhci-spear.
  
  SECURITY SUBSYSTEM
  M:    James Morris <[email protected]>
 +M:    Serge E. Hallyn <[email protected]>
  L:    [email protected] (suggested Cc:)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
  W:    http://kernsec.org/
@@@ -8096,16 -7992,6 +8095,16 @@@ F:    drivers/ata
  F:    include/linux/ata.h
  F:    include/linux/libata.h
  
 +SERIAL ATA AHCI PLATFORM devices support
 +M:    Hans de Goede <[email protected]>
 +M:    Tejun Heo <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Supported
 +F:    drivers/ata/ahci_platform.c
 +F:    drivers/ata/libahci_platform.c
 +F:    include/linux/ahci_platform.h
 +
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
  M:    Jayamohan Kallickal <[email protected]>
  L:    [email protected]
@@@ -8308,22 -8194,17 +8307,22 @@@ S:   Maintaine
  F:    drivers/usb/misc/sisusbvga/
  
  SLAB ALLOCATOR
 -M:    Christoph Lameter <cl@linux-foundation.org>
 +M:    Christoph Lameter <cl@linux.com>
  M:    Pekka Enberg <[email protected]>
 -M:    Matt Mackall <[email protected]>
 +M:    David Rientjes <[email protected]>
 +M:    Joonsoo Kim <[email protected]>
 +M:    Andrew Morton <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    include/linux/sl?b*.h
 -F:    mm/sl?b.c
 +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
@@@ -8423,12 -8304,6 +8422,12 @@@ M:    Chris Boot <[email protected]
  S:    Maintained
  F:    drivers/leds/leds-net48xx.c
  
 +SOFTLOGIC 6x10 MPEG CODEC
 +M:    Ismael Luceno <[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]
@@@ -8619,12 -8494,37 +8618,12 @@@ 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
@@@ -8635,6 -8535,16 +8634,6 @@@ 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]
@@@ -8686,27 -8596,52 +8685,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
@@@ -8942,7 -8877,7 +8941,7 @@@ M:      Stephen Warren <[email protected]
  M:    Thierry Reding <[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/swarren/linux-tegra.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
  S:    Supported
  N:    [^a-z]tegra
  
@@@ -9032,7 -8967,7 +9031,7 @@@ F:      drivers/media/radio/radio-raremono.
  
  THERMAL
  M:    Zhang Rui <[email protected]>
 -M:    Eduardo Valentin <eduardo.valentin@ti.com>
 +M:    Eduardo Valentin <edubezval@gmail.com>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
@@@ -9059,18 -8994,11 +9058,18 @@@ S:   Maintaine
  F:    drivers/platform/x86/thinkpad_acpi.c
  
  TI BANDGAP AND THERMAL DRIVER
 -M:    Eduardo Valentin <eduardo.valentin@ti.com>
 +M:    Eduardo Valentin <edubezval@gmail.com>
  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
@@@ -9347,7 -9275,7 +9346,7 @@@ UNICORE32 ARCHITECTURE
  M:    Guan Xuetao <[email protected]>
  W:    http://mprc.pku.edu.cn/~guanxuetao/linux
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
 +T:    git git://github.com/gxt/linux.git
  F:    arch/unicore32/
  
  UNIFDEF
@@@ -9480,6 -9408,12 +9479,6 @@@ S:     Maintaine
  F:    drivers/usb/host/isp116x*
  F:    include/linux/usb/isp116x.h
  
 -USB KAWASAKI LSI DRIVER
 -M:    Oliver Neukum <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/usb/serial/kl5kusb105.*
 -
  USB MASS STORAGE DRIVER
  M:    Matthew Dharm <[email protected]>
  L:    [email protected]
@@@ -9507,6 -9441,12 +9506,6 @@@ S:     Maintaine
  F:    Documentation/usb/ohci.txt
  F:    drivers/usb/host/ohci*
  
 -USB OPTION-CARD DRIVER
 -M:    Matthias Urlichs <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/usb/serial/option.c
 -
  USB PEGASUS DRIVER
  M:    Petko Manolov <[email protected]>
  L:    [email protected]
@@@ -9539,7 -9479,7 +9538,7 @@@ S:      Maintaine
  F:    drivers/net/usb/rtl8150.c
  
  USB SERIAL SUBSYSTEM
 -M:    Johan Hovold <j[email protected]>
 +M:    Johan Hovold <j[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/usb/usb-serial.txt
@@@ -9558,6 -9498,15 +9557,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]
@@@ -9605,8 -9554,8 +9604,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*.c
 +F:    drivers/usb/gadget/legacy/webcam.c
  
  USB WIRELESS RNDIS DRIVER (rndis_wlan)
  M:    Jussi Kivilinna <[email protected]>
@@@ -9793,14 -9742,6 +9792,14 @@@ L:    [email protected]
  S:    Supported
  F:    arch/x86/kernel/cpu/vmware.c
  
 +VMWARE BALLOON DRIVER
 +M:    Xavier Deguillard <[email protected]>
 +M:    Philip Moltmann <[email protected]>
 +M:    "VMware, Inc." <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/misc/vmw_balloon.c
 +
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <[email protected]>
  M:    "VMware, Inc." <[email protected]>
@@@ -9877,13 -9818,6 +9876,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]
@@@ -10071,13 -10005,6 +10070,13 @@@ 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 SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
diff --combined arch/arm/mach-tegra/board-paz00.c
index bb4782a32713132fc09675fc7450e98ef6f66c51,91fd858ced0d3a4e8471351f91e1ae828c9d51fc..fbe74c6806f3b53e726d96fe2c2f396ad81c9c5f
--- 1/arch/arm/mach-tegra/board-paz00.c
--- 2/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@@ -17,10 -17,9 +17,10 @@@
   *
   */
  
- #include <linux/gpio/driver.h>
 -#include <linux/platform_device.h>
+ #include <linux/gpio/machine.h>
 +#include <linux/platform_device.h>
  #include <linux/rfkill-gpio.h>
 +
  #include "board.h"
  
  static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
diff --combined drivers/gpio/Kconfig
index 4a065b45330f01d4e77f0734d5b4d7ae089772fb,255e8f00910f5572ed8eca85fdfa5fbc0c554acd..9de1515e58081e6b5bef565433e3dd749e725023
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -340,6 -340,13 +340,13 @@@ config GPIO_XILIN
        help
          Say yes here to support the Xilinx FPGA GPIO device
  
+ config GPIO_ZYNQ
+       tristate "Xilinx Zynq GPIO support"
+       depends on ARCH_ZYNQ
+       select GPIOLIB_IRQCHIP
+       help
+         Say yes here to support Xilinx Zynq GPIO controller.
+ 
  config GPIO_XTENSA
        bool "Xtensa GPIO32 support"
        depends on XTENSA
@@@ -423,7 -430,7 +430,7 @@@ config GPIO_GE_FPG
  config GPIO_LYNXPOINT
        tristate "Intel Lynxpoint GPIO support"
        depends on ACPI && X86
-       select IRQ_DOMAIN
+       select GPIOLIB_IRQCHIP
        help
          driver for GPIO functionality on Intel Lynxpoint PCH chipset
          Requires ACPI device enumeration code to set up a platform device.
@@@ -450,19 -457,6 +457,19 @@@ config GPIO_ARIZON
        help
          Support for GPIOs on Wolfson Arizona class devices.
  
 +config GPIO_CRYSTAL_COVE
 +      tristate "GPIO support for Crystal Cove PMIC"
 +      depends on INTEL_SOC_PMIC
 +      select GPIOLIB_IRQCHIP
 +      help
 +        Support for GPIO pins on Crystal Cove PMIC.
 +
 +        Say Yes if you have a Intel SoC based tablet with Crystal Cove PMIC
 +        inside.
 +
 +        This driver can also be built as a module. If so, the module will be
 +        called gpio-crystalcove.
 +
  config GPIO_LP3943
        tristate "TI/National Semiconductor LP3943 GPIO expander"
        depends on MFD_LP3943
@@@ -586,6 -580,7 +593,7 @@@ config GPIO_SX150
  config GPIO_STMPE
        bool "STMPE GPIOs"
        depends on MFD_STMPE
+       select GPIOLIB_IRQCHIP
        help
          This enables support for the GPIOs found on the STMPE I/O
          Expanders.
diff --combined drivers/gpio/Makefile
index e18e9564b073c86246140a9b84ed8f8993f6042d,2881840843f070c90084092a949f87af314af499..5d024e396622ee00ebf956fbe7963edd69398bbd
--- 1/drivers/gpio/Makefile
--- 2/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -4,7 -4,9 +4,9 @@@ ccflags-$(CONFIG_DEBUG_GPIO)     += -DDEBU
  
  obj-$(CONFIG_GPIO_DEVRES)     += devres.o
  obj-$(CONFIG_GPIOLIB)         += gpiolib.o
+ obj-$(CONFIG_GPIOLIB)         += gpiolib-legacy.o
  obj-$(CONFIG_OF_GPIO)         += gpiolib-of.o
+ obj-$(CONFIG_GPIO_SYSFS)      += gpiolib-sysfs.o
  obj-$(CONFIG_GPIO_ACPI)               += gpiolib-acpi.o
  
  # Device drivers. Generally keep list sorted alphabetically
@@@ -20,7 -22,6 +22,7 @@@ obj-$(CONFIG_GPIO_BCM_KONA)   += gpio-bcm
  obj-$(CONFIG_GPIO_BT8XX)      += gpio-bt8xx.o
  obj-$(CONFIG_GPIO_CLPS711X)   += gpio-clps711x.o
  obj-$(CONFIG_GPIO_CS5535)     += gpio-cs5535.o
 +obj-$(CONFIG_GPIO_CRYSTAL_COVE)       += gpio-crystalcove.o
  obj-$(CONFIG_GPIO_DA9052)     += gpio-da9052.o
  obj-$(CONFIG_GPIO_DA9055)     += gpio-da9055.o
  obj-$(CONFIG_GPIO_DAVINCI)    += gpio-davinci.o
@@@ -102,3 -103,4 +104,4 @@@ obj-$(CONFIG_GPIO_WM8994)  += gpio-wm899
  obj-$(CONFIG_GPIO_XILINX)     += gpio-xilinx.o
  obj-$(CONFIG_GPIO_XTENSA)     += gpio-xtensa.o
  obj-$(CONFIG_GPIO_ZEVIO)      += gpio-zevio.o
+ obj-$(CONFIG_GPIO_ZYNQ)               += gpio-zynq.o
diff --combined drivers/gpio/gpio-mcp23s08.c
index 57adbc90fdad8f4dc821fea920f599031e602dad,4fe07864fa039736c3a2febde64a01a3ac41829e..6f183d9b487eaee65f01906573af1ca48d3341ec
--- 1/drivers/gpio/gpio-mcp23s08.c
--- 2/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@@ -812,16 -812,14 +812,14 @@@ fail
  static int mcp230xx_remove(struct i2c_client *client)
  {
        struct mcp23s08 *mcp = i2c_get_clientdata(client);
-       int status;
  
        if (client->irq && mcp->irq_controller)
                mcp23s08_irq_teardown(mcp);
  
-       status = gpiochip_remove(&mcp->chip);
-       if (status == 0)
-               kfree(mcp);
+       gpiochip_remove(&mcp->chip);
+       kfree(mcp);
  
-       return status;
+       return 0;
  }
  
  static const struct i2c_device_id mcp230xx_id[] = {
@@@ -900,6 -898,8 +898,6 @@@ static int mcp23s08_probe(struct spi_de
                        if (spi_present_mask & (1 << addr))
                                chips++;
                }
 -              if (!chips)
 -                      return -ENODEV;
        } else {
                type = spi_get_device_id(spi)->driver_data;
                pdata = dev_get_platdata(&spi->dev);
@@@ -938,6 -938,10 +936,6 @@@
                if (!(spi_present_mask & (1 << addr)))
                        continue;
                chips--;
 -              if (chips < 0) {
 -                      dev_err(&spi->dev, "FATAL: invalid negative chip id\n");
 -                      goto fail;
 -              }
                data->mcp[addr] = &data->chip[chips];
                status = mcp23s08_probe_one(data->mcp[addr], &spi->dev, spi,
                                            0x40 | (addr << 1), type, base,
@@@ -960,13 -964,10 +958,10 @@@
  
  fail:
        for (addr = 0; addr < ARRAY_SIZE(data->mcp); addr++) {
-               int tmp;
  
                if (!data->mcp[addr])
                        continue;
-               tmp = gpiochip_remove(&data->mcp[addr]->chip);
-               if (tmp < 0)
-                       dev_err(&spi->dev, "%s --> %d\n", "remove", tmp);
+               gpiochip_remove(&data->mcp[addr]->chip);
        }
        kfree(data);
        return status;
@@@ -976,23 -977,16 +971,16 @@@ static int mcp23s08_remove(struct spi_d
  {
        struct mcp23s08_driver_data     *data = spi_get_drvdata(spi);
        unsigned                        addr;
-       int                             status = 0;
  
        for (addr = 0; addr < ARRAY_SIZE(data->mcp); addr++) {
-               int tmp;
  
                if (!data->mcp[addr])
                        continue;
  
-               tmp = gpiochip_remove(&data->mcp[addr]->chip);
-               if (tmp < 0) {
-                       dev_err(&spi->dev, "%s --> %d\n", "remove", tmp);
-                       status = tmp;
-               }
+               gpiochip_remove(&data->mcp[addr]->chip);
        }
-       if (status == 0)
-               kfree(data);
-       return status;
+       kfree(data);
+       return 0;
  }
  
  static const struct spi_device_id mcp23s08_ids[] = {
diff --combined drivers/gpio/gpio-rcar.c
index b6ae89ea88119b2b1d35b522f64e07470d20a8dc,c96e2afdad78820542e6588d5b0f8feef36f1b64..bf6c09450feed3c0477a29947fe94e260c93ed1a
--- 1/drivers/gpio/gpio-rcar.c
--- 2/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@@ -240,9 -240,9 +240,9 @@@ static int gpio_rcar_get(struct gpio_ch
        /* testing on r8a7790 shows that INDT does not show correct pin state
         * when configured as output, so use OUTDT in case of output pins */
        if (gpio_rcar_read(gpio_to_priv(chip), INOUTSEL) & bit)
-               return (int)(gpio_rcar_read(gpio_to_priv(chip), OUTDT) & bit);
+               return !!(gpio_rcar_read(gpio_to_priv(chip), OUTDT) & bit);
        else
-               return (int)(gpio_rcar_read(gpio_to_priv(chip), INDT) & bit);
+               return !!(gpio_rcar_read(gpio_to_priv(chip), INDT) & bit);
  }
  
  static void gpio_rcar_set(struct gpio_chip *chip, unsigned offset, int value)
@@@ -284,7 -284,6 +284,7 @@@ static int gpio_rcar_irq_domain_map(str
  
  static struct irq_domain_ops gpio_rcar_irq_domain_ops = {
        .map    = gpio_rcar_irq_domain_map,
 +      .xlate  = irq_domain_xlate_twocell,
  };
  
  struct gpio_rcar_info {
@@@ -472,11 -471,8 +472,8 @@@ err0
  static int gpio_rcar_remove(struct platform_device *pdev)
  {
        struct gpio_rcar_priv *p = platform_get_drvdata(pdev);
-       int ret;
  
-       ret = gpiochip_remove(&p->gpio_chip);
-       if (ret)
-               return ret;
+       gpiochip_remove(&p->gpio_chip);
  
        irq_domain_remove(p->irq_domain);
        pm_runtime_put(&pdev->dev);
Empty description
This page took 0.148534 seconds and 4 git commands to generate.