Merge 3.16-rc5 into staging-next

We want the fixes in -rc5 in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --combined MAINTAINERS
index e2d311c2223087c89360b895a125efaa76f6efa0,e31c87474739329ec0b2458ad26a40f7251f3874..b85ecbea34a8f5bd5954d732359a9f6ebf31f395
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1314,6 -1314,20 +1314,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/
  
@@@ -1781,13 -1795,6 +1795,13 @@@ W:    http://bcache.evilpiepirate.or
  S:    Maintained:
  F:    drivers/md/bcache/
  
 +BECEEM BCS200/BCS220-3/BCSM250 WIMAX SUPPORT
 +M: Kevin McKinney <klmckinney1@gmail.com>
 +M: Matthias Beyer <mail@beyermatthias.de>
 +L: devel@driverdev.osuosl.org
 +S: Maintained
 +F: drivers/staging/bcm*
 +
  BEFS FILE SYSTEM
  S:    Orphan
  F:    Documentation/filesystems/befs.txt
@@@ -2851,7 -2858,6 +2865,7 @@@ F:      drivers/staging/dgnc
  DIGI EPCA PCI PRODUCTS
  M:    Lidza Louina <lidza.louina@gmail.com>
  M:    Mark Hounschell <markh@compro.net>
 +M:    Daeseok Youn <daeseok.youn@gmail.com>
  L:    driverdev-devel@linuxdriverproject.org
  S:    Maintained
  F:    drivers/staging/dgap/
@@@ -5062,6 -5068,13 +5076,6 @@@ S:     Maintaine
  F:    Documentation/hwmon/k8temp
  F:    drivers/hwmon/k8temp.c
  
 -KTAP
 -M:    Jovi Zhangwei <jovi.zhangwei@gmail.com>
 -W:    http://www.ktap.org
 -L:    ktap@freelists.org
 -S:    Maintained
 -F:    drivers/staging/ktap/
 -
  KCONFIG
  M:    "Yann E. MORIN" <yann.morin.1998@free.fr>
  L:    linux-kbuild@vger.kernel.org
@@@ -6788,7 -6801,7 +6802,7 @@@ F:      arch/x86/kernel/quirks.
  
  PCI DRIVER FOR IMX6
  M:    Richard Zhu <r65037@freescale.com>
- M:    Shawn Guo <shawn.guo@linaro.org>
+ M:    Shawn Guo <shawn.guo@freescale.com>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
@@@ -8512,12 -8525,37 +8526,12 @@@ L:   devel@driverdev.osuosl.or
  S:    Supported
  F:    drivers/staging/
  
 -STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
 -M:    Henk de Groot <pe1dnn@amsat.org>
 -S:    Odd Fixes
 -F:    drivers/staging/wlags49_h2/
 -F:    drivers/staging/wlags49_h25/
 -
 -STAGING - ASUS OLED
 -M:    Jakub Schmidtke <sjakub@gmail.com>
 -S:    Odd Fixes
 -F:    drivers/staging/asus_oled/
 -
  STAGING - COMEDI
  M:    Ian Abbott <abbotti@mev.co.uk>
  M:    H Hartley Sweeten <hsweeten@visionengravers.com>
  S:    Odd Fixes
  F:    drivers/staging/comedi/
  
 -STAGING - CRYSTAL HD VIDEO DECODER
 -M:    Naren Sankar <nsankar@broadcom.com>
 -M:    Jarod Wilson <jarod@wilsonet.com>
 -M:    Scott Davilla <davilla@4pi.com>
 -M:    Manu Abraham <abraham.manu@gmail.com>
 -S:    Odd Fixes
 -F:    drivers/staging/crystalhd/
 -
 -STAGING - ECHO CANCELLER
 -M:    Steve Underwood <steveu@coppice.org>
 -M:    David Rowe <david@rowetel.com>
 -S:    Odd Fixes
 -F:    drivers/staging/echo/
 -
  STAGING - ET131X NETWORK DRIVER
  M:    Mark Einon <mark.einon@gmail.com>
  S:    Odd Fixes
@@@ -8589,6 -8627,11 +8603,6 @@@ L:     linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/staging/rtl8723au/
  
 -STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
 -M:    Teddy Wang <teddy.wang@siliconmotion.com.cn>
 -S:    Odd Fixes
 -F:    drivers/staging/sm7xxfb/
 -
  STAGING - SLICOSS
  M:    Lior Dotan <liodot@gmail.com>
  M:    Christopher Harrer <charrer@alacritech.com>
@@@ -8625,6 -8668,11 +8639,6 @@@ M:     Forest Bond <forest@alittletooquiet.
  S:    Odd Fixes
  F:    drivers/staging/vt665?/
  
 -STAGING - WINBOND IS89C35 WLAN USB DRIVER
 -M:    Pavel Machek <pavel@ucw.cz>
 -S:    Odd Fixes
 -F:    drivers/staging/winbond/
 -
  STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
  M:    Arnaud Patard <arnaud.patard@rtp-net.org>
  S:    Odd Fixes
@@@ -8950,7 -8998,7 +8964,7 @@@ F:      drivers/media/radio/radio-raremono.
  
  THERMAL
  M:    Zhang Rui <rui.zhang@intel.com>
- M:    Eduardo Valentin <eduardo.valentin@ti.com>
+ M:    Eduardo Valentin <edubezval@gmail.com>
  L:    linux-pm@vger.kernel.org
  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
@@@ -8977,7 -9025,7 +8991,7 @@@ 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:    linux-pm@vger.kernel.org
  S:    Supported
  F:    drivers/thermal/ti-soc-thermal/