Merge remote-tracking branch 'arm-soc/for-next'

diff --combined MAINTAINERS
index 37c00193b9aa2fd6bbee15cc23535f5419d3ec69,e6829643c0a9f69a7650499e982ed60a27346b91..62ad8e54489b2ab99b88d4af8363f969e4652a77
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1617,12 -1617,6 +1617,6 @@@ S:     Supporte
  F:    drivers/misc/atmel_tclib.c
  F:    drivers/clocksource/tcb_clksrc.c
  
- ATMEL TSADCC DRIVER
- M:    Josh Wu <josh.wu@atmel.com>
- L:    linux-input@vger.kernel.org
- S:    Supported
- F:    drivers/input/touchscreen/atmel_tsadcc.c
- 
  ATMEL USBA UDC DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2246,6 -2240,12 +2240,6 @@@ L:     linux-usb@vger.kernel.or
  S:    Maintained
  F:    drivers/usb/host/ohci-ep93xx.c
  
 -CIRRUS LOGIC CS4270 SOUND DRIVER
 -M:    Timur Tabi <timur@tabi.org>
 -L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -S:    Odd Fixes
 -F:    sound/soc/codecs/cs4270*
 -
  CIRRUS LOGIC AUDIO CODEC DRIVERS
  M:    Brian Austin <brian.austin@cirrus.com>
  M:    Paul Handrigan <Paul.Handrigan@cirrus.com>
@@@ -4813,14 -4813,6 +4807,14 @@@ L:    linux-kernel@vger.kernel.or
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    kernel/irq/
 +
 +IRQCHIP DRIVERS
 +M:    Thomas Gleixner <tglx@linutronix.de>
 +M:    Jason Cooper <jason@lakedaemon.net>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 +T:    git git://git.infradead.org/users/jcooper/linux.git irqchip/core
  F:    drivers/irqchip/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
@@@ -5493,15 -5485,15 +5487,15 @@@ F:   Documentation/hwmon/ltc426
  F:    drivers/hwmon/ltc4261.c
  
  LTP (Linux Test Project)
 -M:    Shubham Goyal <shubham@linux.vnet.ibm.com>
  M:    Mike Frysinger <vapier@gentoo.org>
  M:    Cyril Hrubis <chrubis@suse.cz>
 -M:    Caspar Zhang <caspar@casparzhang.com>
  M:    Wanlong Gao <gaowanlong@cn.fujitsu.com>
 +M:    Jan Stancek <jstancek@redhat.com>
 +M:    Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
 +M:    Alexey Kodanev <alexey.kodanev@oracle.com>
  L:    ltp-list@lists.sourceforge.net (subscribers-only)
 -W:    http://ltp.sourceforge.net/
 +W:    http://linux-test-project.github.io/
  T:    git git://github.com/linux-test-project/ltp.git
 -T:    git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev
  S:    Maintained
  
  M32R ARCHITECTURE
@@@ -6514,10 -6506,10 +6508,10 @@@ T:   git git://openrisc.net/~jonas/linu
  F:    arch/openrisc/
  
  OPENVSWITCH
 -M:    Jesse Gross <jesse@nicira.com>
 +M:    Pravin Shelar <pshelar@nicira.com>
  L:    dev@openvswitch.org
  W:    http://openvswitch.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch.git
  S:    Maintained
  F:    net/openvswitch/
  
@@@ -7291,6 -7283,7 +7285,6 @@@ F:      drivers/video/aty/aty128fb.
  RALINK RT2X00 WIRELESS LAN DRIVER
  P:    rt2x00 project
  M:    Ivo van Doorn <IvDoorn@gmail.com>
 -M:    Gertjan van Wingerde <gwingerde@gmail.com>
  M:    Helmut Schaa <helmut.schaa@googlemail.com>
  L:    linux-wireless@vger.kernel.org
  L:    users@rt2x00.serialmonkey.com (moderated for non-subscribers)
@@@ -7306,7 -7299,7 +7300,7 @@@ F:      Documentation/blockdev/ramdisk.tx
  F:    drivers/block/brd.c
  
  RANDOM NUMBER DRIVER
 -M:    Theodore Ts'o" <tytso@mit.edu>
 +M:    "Theodore Ts'o" <tytso@mit.edu>
  S:    Maintained
  F:    drivers/char/random.c
  
@@@ -7687,6 -7680,7 +7681,6 @@@ F:      drivers/clk/samsung
  SAMSUNG SXGBE DRIVERS
  M:    Byungho An <bh74.an@samsung.com>
  M:    Girish K S <ks.giri@samsung.com>
 -M:    Siva Reddy Kallam <siva.kallam@samsung.com>
  M:    Vipul Pandya <vipul.pandya@samsung.com>
  S:    Supported
  L:    netdev@vger.kernel.org
@@@ -9110,9 -9104,6 +9104,9 @@@ F:      arch/um/os-Linux/drivers
  
  TURBOCHANNEL SUBSYSTEM
  M:    "Maciej W. Rozycki" <macro@linux-mips.org>
 +M:    Ralf Baechle <ralf@linux-mips.org>
 +L:    linux-mips@linux-mips.org
 +Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
  S:    Maintained
  F:    drivers/tc/
  F:    include/linux/tc.h
@@@ -9966,7 -9957,7 +9960,7 @@@ F:      drivers/net/hamradio/*scc.
  F:    drivers/net/hamradio/z8530.h
  
  ZBUD COMPRESSED PAGE ALLOCATOR
 -M:    Seth Jennings <sjenning@linux.vnet.ibm.com>
 +M:    Seth Jennings <sjennings@variantweb.net>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/zbud.c
@@@ -10011,7 -10002,7 +10005,7 @@@ F:   mm/zsmalloc.
  F:    include/linux/zsmalloc.h
  
  ZSWAP COMPRESSED SWAP CACHING
 -M:    Seth Jennings <sjenning@linux.vnet.ibm.com>
 +M:    Seth Jennings <sjennings@variantweb.net>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/zswap.c

diff --combined arch/arm/Kconfig
index 696e993da7e390be2262dcab5dcc09890689b40e,1c1fbbf6e4ae04c823200355b6c1a1ec04ed4079..216ecbdfddf408db6fbbf99e00d0f4d2f2985411
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -376,7 -376,6 +376,6 @@@ config ARCH_AT9
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select IRQ_DOMAIN
-       select NEED_MACH_GPIO_H
        select NEED_MACH_IO_H if PCCARD
        select PINCTRL
        select PINCTRL_AT91 if USE_OF
@@@ -2295,11 -2294,6 +2294,11 @@@ config ARCH_SUSPEND_POSSIBL
  config ARM_CPU_SUSPEND
        def_bool PM_SLEEP
  
 +config ARCH_HIBERNATION_POSSIBLE
 +      bool
 +      depends on MMU
 +      default y if ARCH_SUSPEND_POSSIBLE
 +
  endmenu
  
  source "net/Kconfig"

diff --combined drivers/input/touchscreen/Kconfig
index b845e9370871bfdc0038ad8202b1d49bdddef121,0b5965ba51bc591c2c67e7416ec1b2a06a6ad47b..d4e5ab57909fd132dc7e61291ed007901d23b8aa
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -550,18 -550,6 +550,6 @@@ config TOUCHSCREEN_TI_AM335X_TS
          To compile this driver as a module, choose M here: the
          module will be called ti_am335x_tsc.
  
- config TOUCHSCREEN_ATMEL_TSADCC
-       tristate "Atmel Touchscreen Interface"
-       depends on ARCH_AT91
-       help
-         Say Y here if you have a 4-wire touchscreen connected to the
-           ADC Controller on your Atmel SoC.
- 
-         If unsure, say N.
- 
-         To compile this driver as a module, choose M here: the
-         module will be called atmel_tsadcc.
- 
  config TOUCHSCREEN_UCB1400
        tristate "Philips UCB1400 touchscreen"
        depends on AC97_BUS
@@@ -640,7 -628,7 +628,7 @@@ config TOUCHSCREEN_WM971
  
  config TOUCHSCREEN_WM97XX_ATMEL
        tristate "WM97xx Atmel accelerated touch"
 -      depends on TOUCHSCREEN_WM97XX && (AVR32 || ARCH_AT91)
 +      depends on TOUCHSCREEN_WM97XX && AVR32
        help
          Say Y here for support for streaming mode with WM97xx touchscreens
          on Atmel AT91 or AVR32 systems with an AC97C module.