Merge tag 'gpio-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

Pull GPIO updates from Linus Walleij:
 "This is the bulk of GPIO changes for the v3.12 series:

   - A new driver for the TZ1090 PDC which is used on the metag
     architecture.

   - A new driver for the Kontron ETX or COMexpress GPIO block.  This is
     found on some ETX x86 devices.

   - A new driver for the Fintek Super-I/O chips, used on some x86
     boards.

   - Added device tree probing on a few select GPIO blocks.

   - Drop the Exynos support from the Samsung GPIO driver.

     The Samsung maintainers have moved over to use the modernized pin
     control driver to provide GPIO for the modern platforms instead.

   - The usual bunch of non-critical fixes and cleanups"

* tag 'gpio-v3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (36 commits)
  gpio: return -ENOTSUPP if debounce cannot be set
  gpio: improve error path in gpiolib
  gpio: add GPIO support for F71882FG and F71889F
  of: add vendor prefix for Microchip Technology Inc
  gpio: mcp23s08: rename the device tree property
  gpio: samsung: Drop support for Exynos SoCs
  gpio: pcf857x: Remove pdata argument to pcf857x_irq_domain_init()
  gpio: pcf857x: Sort headers alphabetically
  gpio: max7301: Reverting "Do not force SPI speed when using OF Platform"
  gpio: Fix bit masking in Kontron PLD GPIO driver
  gpio: pca953x: fix gpio input on gpio offsets >= 8
  drivers/gpio: simplify use of devm_ioremap_resource
  drivers/gpio/gpio-omap.c: convert comma to semicolon
  gpio-lynxpoint: Fix warning about unbalanced pm_runtime_enable
  gpio: Fix platform driver name in Kontron PLD GPIO driver
  gpio: adnp: Fix segfault if request_threaded_irq fails
  gpio: msm: Staticize local variable 'msm_gpio'
  gpio: gpiolib-of.c: make error message more meaningful by adding the node name and index
  gpio: use dev_get_platdata()
  gpio/mxc: add chained_irq_enter/exit() to mx2_gpio_irq_handler
  ...

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index b571560ed5f956f05da7edf425b2c3529023cda1,13d987495209da3a8e1443c136507eec444c28f4..2956800f0240c8b3e48c9427151220ef2fc39fc1
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -7,12 -7,10 +7,12 @@@ ad    Avionic Design Gmb
  adi   Analog Devices, Inc.
  aeroflexgaisler       Aeroflex Gaisler AB
  ak    Asahi Kasei Corp.
 +altr  Altera Corp.
  amcc  Applied Micro Circuits Corporation (APM, formally AMCC)
  apm   Applied Micro Circuits Corporation (APM)
  arm   ARM Ltd.
  atmel Atmel Corporation
 +avago Avago Technologies
  bosch Bosch Sensortec GmbH
  brcm  Broadcom Corporation
  cavium        Cavium, Inc.
@@@ -28,7 -26,6 +28,7 @@@ est   ESTeem Wireless Modem
  fsl   Freescale Semiconductor
  GEFanuc       GE Fanuc Intelligent Platforms Embedded Systems, Inc.
  gef   GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 +hisilicon     Hisilicon Limited.
  hp    Hewlett Packard
  ibm   International Business Machines (IBM)
  idt   Integrated Device Technologies, Inc.
@@@ -38,6 -35,7 +38,7 @@@ linux Linux-specific bindin
  lsi   LSI Corp. (LSI Logic)
  marvell       Marvell Technology Group Ltd.
  maxim Maxim Integrated Products
+ microchip     Microchip Technology Inc.
  mosaixtech    Mosaix Technologies, Inc.
  national      National Semiconductor
  nintendo      Nintendo
@@@ -46,7 -44,6 +47,7 @@@ nxp   NXP Semiconductor
  onnn  ON Semiconductor Corp.
  picochip      Picochip Ltd
  powervr       PowerVR (deprecated, use img)
 +qca   Qualcomm Atheros, Inc.
  qcom  Qualcomm, Inc.
  ralink        Mediatek/Ralink Technology Corp.
  ramtron       Ramtron International

diff --combined MAINTAINERS
index e775ecaf5d1f49a1c97ebe333869cff9463c07a5,3a9e87987cd3cd0d69355f52dfac120d6b0f1c54..b6b29c38b6b67d5c950188da793f35696e00e7be
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -580,24 -580,12 +580,24 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/media/i2c/ad9389b*
  
 +ANALOG DEVICES INC ADV7511 DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/adv7511*
 +
  ANALOG DEVICES INC ADV7604 DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/adv7604*
  
 +ANALOG DEVICES INC ADV7842 DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/adv7842*
 +
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  L:    [email protected]
@@@ -607,7 -595,6 +607,7 @@@ S: Supporte
  F:    sound/soc/codecs/adau*
  F:    sound/soc/codecs/adav*
  F:    sound/soc/codecs/ad1*
 +F:    sound/soc/codecs/ad7*
  F:    sound/soc/codecs/ssm*
  F:    sound/soc/codecs/sigmadsp.*
  
@@@ -651,12 -638,6 +651,12 @@@ S:       Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 +APTINA CAMERA SENSOR PLL
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/aptina-pll.*
 +
  ARASAN COMPACT FLASH PATA CONTROLLER
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
@@@ -832,7 -813,7 +832,7 @@@ F: arch/arm/mach-prima2
  F:    drivers/dma/sirf-dma.c
  F:    drivers/i2c/busses/i2c-sirf.c
  F:    drivers/mmc/host/sdhci-sirf.c
 -F:    drivers/pinctrl/pinctrl-sirf.c
 +F:    drivers/pinctrl/sirf/
  F:    drivers/spi/spi-sirf.c
  
  ARM/EBSA110 MACHINE SUPPORT
@@@ -984,12 -965,6 +984,12 @@@ M:       Lennert Buytenhek <kernel@wantstofly
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/TEXAS INSTRUMENT KEYSTONE ARCHITECTURE
 +M:    Santosh Shilimkar <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-keystone/
 +
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1284,6 -1259,7 +1284,6 @@@ F:      drivers/rtc/rtc-coh901331.
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
  
  ARM/Ux500 ARM ARCHITECTURE
 -M:    Srinidhi Kasagar <[email protected]>
  M:    Linus Walleij <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -1320,7 -1296,6 +1320,6 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/vt8500_timer.c
- F:    drivers/gpio/gpio-vt8500.c
  F:    drivers/i2c/busses/i2c-wmt.c
  F:    drivers/mmc/host/wmt-sdmmc.c
  F:    drivers/pwm/pwm-vt8500.c
@@@ -1430,7 -1405,7 +1429,7 @@@ ATHEROS ATH6KL WIRELESS DRIVE
  M:    Kalle Valo <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git
 +T:    git git://github.com/kvalo/ath.git
  S:    Supported
  F:    drivers/net/wireless/ath/ath6kl/
  
@@@ -1566,13 -1541,6 +1565,13 @@@ W:    http://atmelwlandriver.sourceforge.n
  S:    Maintained
  F:    drivers/net/wireless/atmel*
  
 +ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
 +M:      Bradley Grove <[email protected]>
 +L:      [email protected]
 +W:      http://www.attotech.com
 +S:      Supported
 +F:      drivers/scsi/esas2r
 +
  AUDIT SUBSYSTEM
  M:    Al Viro <[email protected]>
  M:    Eric Paris <[email protected]>
@@@ -1673,7 -1641,7 +1672,7 @@@ S:      Maintaine
  F:    drivers/net/hamradio/baycom*
  
  BCACHE (BLOCK LAYER CACHE)
 -M:    Kent Overstreet <koverstreet@google.com>
 +M:    Kent Overstreet <kmo@daterainc.com>
  L:    [email protected]
  W:    http://bcache.evilpiepirate.org
  S:    Maintained:
@@@ -1849,12 -1817,6 +1848,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/scsi/bnx2fc/
  
 +BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
 +M:    Eddie Wai <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/bnx2i/
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <[email protected]>
  L:    [email protected]
@@@ -2108,8 -2070,7 +2107,8 @@@ F:      drivers/usb/chipidea
  
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <[email protected]>
 -M:    Roopa Prabhu <[email protected]>
 +M:    Sujith Sankar <[email protected]>
 +M:    Govindarajulu Varadarajan <[email protected]>
  M:    Neel Patel <[email protected]>
  M:    Nishank Trivedi <[email protected]>
  S:    Supported
@@@ -2145,13 -2106,6 +2144,13 @@@ M:    Russell King <[email protected]
  S:    Maintained
  F:    include/linux/clk.h
  
 +CLOCKSOURCE, CLOCKEVENT DRIVERS
 +M:    Daniel Lezcano <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 +S:    Supported
 +F:    drivers/clocksource
 +
  CISCO FCOE HBA DRIVER
  M:    Hiral Patel <[email protected]>
  M:    Suma Ramars <[email protected]>
@@@ -2494,9 -2448,9 +2493,9 @@@ S:      Maintaine
  F:    drivers/media/common/cypress_firmware*
  
  CYTTSP TOUCHSCREEN DRIVER
 -M:    Javier Martinez Canillas <[email protected]>
 +M:    Ferruh Yigit <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    drivers/input/touchscreen/cyttsp*
  F:    include/linux/input/cyttsp.h
  
@@@ -2916,7 -2870,7 +2915,7 @@@ F:      drivers/media/usb/dvb-usb-v2/dvb_usb
  F:    drivers/media/usb/dvb-usb-v2/usb_urb.c
  
  DYNAMIC DEBUG
 -M:    Jason Baron <jbaron@redhat.com>
 +M:    Jason Baron <jbaron@akamai.com>
  S:    Maintained
  F:    lib/dynamic_debug.c
  F:    include/linux/dynamic_debug.h
@@@ -3391,7 -3345,7 +3390,7 @@@ F:      Documentation/firmware_class
  F:    drivers/base/firmware*.c
  F:    include/linux/firmware.h
  
 -FLASHSYSTEM DRIVER (IBM FlashSystem 70/80 PCI SSD Flash Card)
 +FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)
  M:    Joshua Morris <[email protected]>
  M:    Philip Kelleher <[email protected]>
  S:    Maintained
@@@ -3667,9 -3621,11 +3666,9 @@@ F:     drivers/isdn/gigaset
  F:    include/uapi/linux/gigaset_dev.h
  
  GPIO SUBSYSTEM
 -M:    Grant Likely <[email protected]>
  M:    Linus Walleij <[email protected]>
  S:    Maintained
  L:    [email protected]
 -T:    git git://git.secretlab.ca/git/linux-2.6.git
  F:    Documentation/gpio.txt
  F:    drivers/gpio/
  F:    include/linux/gpio*
@@@ -4141,13 -4097,6 +4140,13 @@@ W:    http://launchpad.net/ideapad-lapto
  S:    Maintained
  F:    drivers/platform/x86/ideapad-laptop.c
  
 +IDEAPAD LAPTOP SLIDEBAR DRIVER
 +M:    Andrey Moiseev <[email protected]>
 +L:    [email protected]
 +W:    https://github.com/o2genum/ideapad-slidebar
 +S:    Maintained
 +F:    drivers/input/misc/ideapad_slidebar.c
 +
  IDE/ATAPI DRIVERS
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
@@@ -4412,7 -4361,7 +4411,7 @@@ F:      drivers/net/wireless/iwlegacy
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Johannes Berg <[email protected]>
 -M:    Wey-Yi Guy <wey-yi.w.guy@intel.com>
 +M:    Emmanuel Grumbach <emmanuel.grumbach@intel.com>
  M:    Intel Linux Wireless <[email protected]>
  L:    [email protected]
  W:    http://intellinuxwireless.org
@@@ -4522,6 -4471,8 +4521,6 @@@ F:      drivers/irqchip
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Benjamin Herrenschmidt <[email protected]>
 -M:    Grant Likely <[email protected]>
 -T:    git git://git.secretlab.ca/git/linux-2.6.git irqdomain/next
  S:    Maintained
  F:    Documentation/IRQ-domain.txt
  F:    include/linux/irqdomain.h
@@@ -5038,7 -4989,7 +5037,7 @@@ F:      arch/powerpc/platforms/44x
  
  LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
  L:    [email protected]
 -S:    Unmaintained
 +S:    Orphan
  F:    arch/powerpc/*/*virtex*
  F:    arch/powerpc/*/*/*virtex*
  
@@@ -5544,7 -5495,7 +5543,7 @@@ L:      [email protected]
  S:    Supported
  F:    drivers/platform/x86/msi-wmi.c
  
 -MT9M032 SENSOR DRIVER
 +MT9M032 APTINA SENSOR DRIVER
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5552,7 -5503,7 +5551,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9m032.c
  F:    include/media/mt9m032.h
  
 -MT9P031 SENSOR DRIVER
 +MT9P031 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5560,7 -5511,7 +5559,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9p031.c
  F:    include/media/mt9p031.h
  
 -MT9T001 SENSOR DRIVER
 +MT9T001 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5568,7 -5519,7 +5567,7 @@@ S:      Maintaine
  F:    drivers/media/i2c/mt9t001.c
  F:    include/media/mt9t001.h
  
 -MT9V032 SENSOR DRIVER
 +MT9V032 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
@@@ -5628,9 -5579,9 +5627,9 @@@ S:      Maintaine
  F:    drivers/media/tuners/mxl5007t.*
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 -M:    Andrew Gallatin <gallatin@myri.com>
 +M:    Hyong-Youb Kim <hykim@myri.com>
  L:    [email protected]
 -W:    http://www.myri.com/scs/download-Myri10GE.html
 +W:    https://www.myricom.com/support/downloads/myri10ge.html
  S:    Supported
  F:    drivers/net/ethernet/myricom/myri10ge/
  
@@@ -5839,7 -5790,7 +5838,7 @@@ M:      Aloisio Almeida Jr <aloisio.almeida@
  M:    Samuel Ortiz <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 +S:    Supported
  F:    net/nfc/
  F:    include/net/nfc/
  F:    include/uapi/linux/nfc.h
@@@ -5931,10 -5882,10 +5930,10 @@@ F:   drivers/i2c/busses/i2c-omap.
  F:    include/linux/i2c-omap.h
  
  OMAP DEVICE TREE SUPPORT
 -M:    Benoît Cousson <b-cousson@ti.com>
 +M:    Benoît Cousson <bcousson@baylibre.com>
  M:    Tony Lindgren <[email protected]>
  L:    [email protected]
 -L:    devicetree[email protected] (moderated for non-subscribers)
 +L:    devicetree@vger.kernel.org
  S:    Maintained
  F:    arch/arm/boot/dts/*omap*
  F:    arch/arm/boot/dts/*am3*
@@@ -6011,14 -5962,14 +6010,14 @@@ S:   Maintaine
  F:    drivers/char/hw_random/omap-rng.c
  
  OMAP HWMOD SUPPORT
 -M:    Benoît Cousson <b-cousson@ti.com>
 +M:    Benoît Cousson <bcousson@baylibre.com>
  M:    Paul Walmsley <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod.*
  
  OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
 -M:    Benoît Cousson <b-cousson@ti.com>
 +M:    Benoît Cousson <bcousson@baylibre.com>
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -6098,28 -6049,17 +6097,28 @@@ F:   drivers/i2c/busses/i2c-ocores.
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <[email protected]>
  M:    Rob Herring <[email protected]>
 -L:    devicetree[email protected] (moderated for non-subscribers)
 +L:    devicetree@vger.kernel.org
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  S:    Maintained
 -F:    Documentation/devicetree
 -F:    drivers/of
 +F:    drivers/of/
  F:    include/linux/of*.h
 -F:    scripts/dtc
 +F:    scripts/dtc/
  K:    of_get_property
  K:    of_match_table
  
 +OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 +M:    Rob Herring <[email protected]>
 +M:    Pawel Moll <[email protected]>
 +M:    Mark Rutland <[email protected]>
 +M:    Stephen Warren <[email protected]>
 +M:    Ian Campbell <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/
 +F:    arch/*/boot/dts/
 +F:    include/dt-bindings/
 +
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <[email protected]>
  W:    http://openrisc.net
@@@ -6322,13 -6262,6 +6321,13 @@@ F:    Documentation/PCI
  F:    drivers/pci/
  F:    include/linux/pci*
  
 +PCI DRIVER FOR NVIDIA TEGRA
 +M:    Thierry Reding <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
 +F:    drivers/pci/host/pci-tegra.c
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
@@@ -6730,11 -6663,11 +6729,11 @@@ F:   Documentation/scsi/LICENSE.qla2xx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA4XXX iSCSI DRIVER
 -M:    Ravi Anand <[email protected]>
  M:    Vikas Chaudhary <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
 +F:    Documentation/scsi/LICENSE.qla4xxx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLA3XXX NETWORK DRIVER
@@@ -6785,14 -6718,6 +6784,14 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/tuners/qt1010*
  
 +QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 +M:    Kalle Valo <[email protected]>
 +L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/ath10k
 +T:    git git://github.com/kvalo/ath.git
 +S:    Supported
 +F:    drivers/net/wireless/ath/ath10k/
 +
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Richard Kuo <[email protected]>
  L:    [email protected]
@@@ -6975,14 -6900,6 +6974,14 @@@ M:    Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/memstick/host/r592.*
  
 +ROCCAT DRIVERS
 +M:    Stefan Achatz <[email protected]>
 +W:    http://sourceforge.net/projects/roccat/
 +S:    Maintained
 +F:    drivers/hid/hid-roccat*
 +F:    include/linux/hid-roccat*
 +F:    Documentation/ABI/*/sysfs-driver-hid-roccat*
 +
  ROCKETPORT DRIVER
  P:    Comtrol Corp.
  W:    http://www.comtrol.com
@@@ -7205,7 -7122,7 +7204,7 @@@ S:      Maintaine
  F:    include/linux/mmc/dw_mmc.h
  F:    drivers/mmc/host/dw_mmc*
  
 -TIMEKEEPING, NTP
 +TIMEKEEPING, CLOCKSOURCE CORE, NTP
  M:    John Stultz <[email protected]>
  M:    Thomas Gleixner <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
@@@ -7218,6 -7135,7 +7217,6 @@@ F:      include/uapi/linux/timex.
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
 -F:    drivers/clocksource
  
  TLG2300 VIDEO4LINUX-2 DRIVER
  M:    Huang Shijie <[email protected]>
@@@ -7297,7 -7215,6 +7296,7 @@@ W:      http://lksctp.sourceforge.ne
  S:    Maintained
  F:    Documentation/networking/sctp.txt
  F:    include/linux/sctp.h
 +F:    include/uapi/linux/sctp.h
  F:    include/net/sctp/
  F:    net/sctp/
  
@@@ -7428,6 -7345,7 +7427,6 @@@ F:      drivers/net/ethernet/sfc
  
  SGI GRU DRIVER
  M:    Dimitri Sivanich <[email protected]>
 -M:    Robin Holt <[email protected]>
  S:    Maintained
  F:    drivers/misc/sgi-gru/
  
@@@ -7447,8 -7365,7 +7446,8 @@@ S:      Maintained for 2.6
  F:    Documentation/sgi-visws.txt
  
  SGI XP/XPC/XPNET DRIVER
 -M:    Robin Holt <[email protected]>
 +M:    Cliff Whickman <[email protected]>
 +M:    Robin Holt <[email protected]>
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
@@@ -7737,17 -7654,6 +7736,17 @@@ F:    include/sound
  F:    include/uapi/sound/
  F:    sound/
  
 +SOUND - COMPRESSED AUDIO
 +M:    Vinod Koul <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 +S:    Supported
 +F:    Documentation/sound/alsa/compress_offload.txt
 +F:    include/sound/compress_driver.h
 +F:    include/uapi/sound/compress_*
 +F:    sound/core/compress_offload.c
 +F:    sound/soc/soc-compress.c
 +
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
  M:    Liam Girdwood <[email protected]>
  M:    Mark Brown <[email protected]>
@@@ -7755,7 -7661,6 +7754,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  L:    [email protected] (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
 +F:    Documentation/sound/alsa/soc/
  F:    sound/soc/
  F:    include/sound/soc*
  
@@@ -7840,6 -7745,7 +7839,6 @@@ F:      drivers/clk/spear
  
  SPI SUBSYSTEM
  M:    Mark Brown <[email protected]>
 -M:    Grant Likely <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
@@@ -7905,7 -7811,7 +7904,7 @@@ F:      drivers/staging/asus_oled
  
  STAGING - COMEDI
  M:    Ian Abbott <[email protected]>
 -M:    Mori Hess <[email protected]>
 +M:    H Hartley Sweeten <[email protected]>
  S:    Odd Fixes
  F:    drivers/staging/comedi/
  
@@@ -7964,11 -7870,11 +7963,11 @@@ S:   Maintaine
  F:    drivers/staging/nvec/
  
  STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 -M:    Andres Salomon <[email protected]>
 -M:    Chris Ball <cjb@laptop.org>
 +M:    Jens Frederich <[email protected]>
 +M:    Daniel Drake <dsd@laptop.org>
  M:    Jon Nettleton <[email protected]>
  W:    http://wiki.laptop.org/go/DCON
 -S:    Odd Fixes
 +S:    Maintained
  F:    drivers/staging/olpc_dcon/
  
  STAGING - OZMO DEVICES USB OVER WIFI DRIVER
@@@ -8046,12 -7952,6 +8045,12 @@@ F:    arch/m68k/sun3*
  F:    arch/m68k/include/asm/sun3*
  F:    drivers/net/ethernet/i825xx/sun3*
  
 +SUNDANCE NETWORK DRIVER
 +M:    Denis Kirjanov <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/dlink/sundance.c
 +
  SUPERH
  M:    Paul Mundt <[email protected]>
  L:    [email protected]
@@@ -8363,7 -8263,7 +8362,7 @@@ S:      Maintaine
  F:    sound/soc/codecs/twl4030*
  
  TI WILINK WIRELESS DRIVERS
 -M:    Luciano Coelho <[email protected]>
 +M:    Luciano Coelho <[email protected]>
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/wl12xx
  W:    http://wireless.kernel.org/en/users/Drivers/wl1251
@@@ -8387,14 -8287,9 +8386,14 @@@ M:    Chris Metcalf <[email protected]
  W:    http://www.tilera.com/scm/
  S:    Supported
  F:    arch/tile/
 -F:    drivers/tty/hvc/hvc_tile.c
 -F:    drivers/net/ethernet/tile/
 +F:    drivers/char/tile-srom.c
  F:    drivers/edac/tile_edac.c
 +F:    drivers/net/ethernet/tile/
 +F:    drivers/rtc/rtc-tile.c
 +F:    drivers/tty/hvc/hvc_tile.c
 +F:    drivers/tty/serial/tilegx.c
 +F:    drivers/usb/host/*-tilegx.c
 +F:    include/linux/usb/tilegx.h
  
  TLAN NETWORK DRIVER
  M:    Samuel Chessman <[email protected]>
@@@ -8754,11 -8649,6 +8753,11 @@@ T:    git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    sound/usb/midi.*
  
 +USB NETWORKING DRIVERS
 +L:    [email protected]
 +S:    Odd Fixes
 +F:    drivers/net/usb/
 +
  USB OHCI DRIVER
  M:    Alan Stern <[email protected]>
  L:    [email protected]
@@@ -8888,6 -8778,7 +8887,6 @@@ W:      http://www.linux-usb.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
  S:    Supported
  F:    Documentation/usb/
 -F:    drivers/net/usb/
  F:    drivers/usb/
  F:    include/linux/usb.h
  F:    include/linux/usb/
@@@ -9110,12 -9001,6 +9109,12 @@@ F:    drivers/staging/vme
  F:    drivers/vme/
  F:    include/linux/vme*
  
 +VMWARE HYPERVISOR INTERFACE
 +M:    Alok Kataria <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/kernel/cpu/vmware.c
 +
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <[email protected]>
  M:    "VMware, Inc." <[email protected]>
@@@ -9337,9 -9222,9 +9336,9 @@@ F:      drivers/media/tuners/tuner-xc2028.
  
  XEN HYPERVISOR INTERFACE
  M:    Konrad Rzeszutek Wilk <[email protected]>
 -M:    Jeremy Fitzhardinge <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected]
 +M:    Boris Ostrovsky <[email protected]>
 +M:    David Vrabel <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c
@@@ -9350,35 -9235,35 +9349,35 @@@ F:   include/uapi/xen
  
  XEN HYPERVISOR ARM
  M:    Stefano Stabellini <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm/xen/
  F:    arch/arm/include/asm/xen/
  
  XEN HYPERVISOR ARM64
  M:    Stefano Stabellini <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm64/xen/
  F:    arch/arm64/include/asm/xen/
  
  XEN NETWORK BACKEND DRIVER
  M:    Ian Campbell <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  L:    [email protected]
  S:    Supported
  F:    drivers/net/xen-netback/*
  
  XEN PCI SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/pci/*xen*
  F:    drivers/pci/*xen*
  
  XEN SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
 -L:    [email protected]source.com (moderated for non-subscribers)
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/x86/xen/*swiotlb*
  F:    drivers/xen/*swiotlb*
@@@ -9402,7 -9287,7 +9401,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/xilinx/xilinx_axienet*
  
  XILINX SYSTEMACE DRIVER
 -S:    Unmaintained
 +S:    Orphan
  F:    drivers/block/xsysace.c
  
  XILINX UARTLITE SERIAL DRIVER

diff --combined drivers/gpio/gpio-msm-v2.c
index c2fa77086eb58cf9de7f2c2a453c900a9771f0b5,27fe8b11b67a4cd2989f110ace39860f40513308..f7a0cc4da9502d12ef0aa602dfa249665e5a5c4a
--- 1/drivers/gpio/gpio-msm-v2.c
--- 2/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@@ -106,7 -106,7 +106,7 @@@ struct msm_gpio_dev 
        void __iomem *msm_tlmm_base;
  };
  
- struct msm_gpio_dev msm_gpio;
+ static struct msm_gpio_dev msm_gpio;
  
  #define GPIO_INTR_CFG_SU(gpio)    (msm_gpio.msm_tlmm_base + 0x0400 + \
                                                                (0x04 * (gpio)))
@@@ -378,7 -378,7 +378,7 @@@ static int msm_gpio_probe(struct platfo
        int ret, ngpio;
        struct resource *res;
  
 -      if (!of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio)) {
 +      if (of_property_read_u32(pdev->dev.of_node, "ngpio", &ngpio)) {
                dev_err(&pdev->dev, "%s: ngpio property missing\n", __func__);
                return -EINVAL;
        }

diff --combined drivers/gpio/gpio-pca953x.c
index 8804aec2950fb9f81e317f4b7e46bd2a2d601aaf,91eb8d4492ef90a2531b085d4c4850ce5831e462..cdd1aa12b895e3017bfd79da95e6b499fb3bf28f
--- 1/drivers/gpio/gpio-pca953x.c
--- 2/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@@ -18,7 -18,7 +18,7 @@@
  #include <linux/irq.h>
  #include <linux/irqdomain.h>
  #include <linux/i2c.h>
 -#include <linux/i2c/pca953x.h>
 +#include <linux/platform_data/pca953x.h>
  #include <linux/slab.h>
  #ifdef CONFIG_OF_GPIO
  #include <linux/of_platform.h>
@@@ -308,7 -308,7 +308,7 @@@ static int pca953x_gpio_get_value(struc
                return 0;
        }
  
-       return (reg_val & (1u << off)) ? 1 : 0;
+       return (reg_val & (1u << (off % BANK_SZ))) ? 1 : 0;
  }
  
  static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val)
@@@ -731,7 -731,7 +731,7 @@@ static int pca953x_probe(struct i2c_cli
        if (chip == NULL)
                return -ENOMEM;
  
-       pdata = client->dev.platform_data;
+       pdata = dev_get_platdata(&client->dev);
        if (pdata) {
                irq_base = pdata->irq_base;
                chip->gpio_start = pdata->gpio_base;
@@@ -785,7 -785,7 +785,7 @@@
  
  static int pca953x_remove(struct i2c_client *client)
  {
-       struct pca953x_platform_data *pdata = client->dev.platform_data;
+       struct pca953x_platform_data *pdata = dev_get_platdata(&client->dev);
        struct pca953x_chip *chip = i2c_get_clientdata(client);
        int ret = 0;