Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)
  net/hyperv: Add support for jumbo frame up to 64KB
  net/hyperv: Add NETVSP protocol version negotiation
  net/hyperv: Remove unnecessary kmap_atomic in netvsc driver
  staging/rtl8192e: Register against lib80211
  staging/rtl8192e: Convert to lib80211_crypt_info
  staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops
  staging/rtl8192e: Add lib80211.h to rtllib.h
  staging/mei: add watchdog device registration wrappers
  drm/omap: GEM, deal with cache
  staging: vt6656: int.c, int.h: Change return of function to void
  staging: usbip: removed unused definitions from header
  staging: usbip: removed dead code from receive function
  staging:iio: Drop {mark,unmark}_in_use callbacks
  staging:iio: Drop buffer mark_param_change callback
  staging:iio: Drop the unused buffer enable() and is_enabled() callbacks
  staging:iio: Drop buffer busy flag
  staging:iio: Make sure a device is only opened once at a time
  staging:iio: Disallow modifying buffer size when buffer is enabled
  staging:iio: Disallow changing scan elements in all buffered modes
  staging:iio: Use iio_buffer_enabled instead of open coding it
  ...

Fix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of
module_init due to using module_i2c_driver() helper, next to removal of
MODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).

1 files changed, 2 insertions, 37 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1e7d90442651..78b078e8e0af 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -184,11 +184,6 @@ S:	Maintained
 F:      Documentation/filesystems/9p.txt
 F:      fs/9p/
 
-A2232 SERIAL BOARD DRIVER
-L:      linux-m68k@lists.linux-m68k.org
-S:      Orphan
-F:      drivers/staging/generic_serial/ser_a2232*
-
 AACRAID SCSI RAID DRIVER
 M:      Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 L:      linux-scsi@vger.kernel.org
@@ -1587,7 +1582,7 @@ M:	Franky (Zhenhui) Lin <frankyl@broadcom.com>
 M:      Kan Yan <kanyan@broadcom.com>
 L:      linux-wireless@vger.kernel.org
 S:      Supported
-F:      drivers/staging/brcm80211/
+F:      drivers/net/wireless/brcm80211/
 
 BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 M:      Bhanu Prakash Gollapudi <bprakash@broadcom.com>
@@ -1891,12 +1886,6 @@ L:	platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/compal-laptop.c
 
-COMPUTONE INTELLIPORT MULTIPORT CARD
-W:      http://www.wittsend.com/computone.html
-S:      Orphan
-F:      Documentation/serial/computone.txt
-F:      drivers/staging/tty/ip2/
-
 CONEXANT ACCESSRUNNER USB DRIVER
 M:      Simon Arlott <cxacru@fire.lp0.eu>
 L:      accessrunner-general@lists.sourceforge.net
@@ -2200,15 +2189,6 @@ F:	drivers/md/dm*
 F:      include/linux/device-mapper.h
 F:      include/linux/dm-*.h
 
-DIGI INTL. EPCA DRIVER
-M:      "Digi International, Inc" <Eng.Linux@digi.com>
-L:      Eng.Linux@digi.com
-W:      http://www.digi.com
-S:      Orphan
-F:      Documentation/serial/digiepca.txt
-F:      drivers/staging/tty/epca*
-F:      drivers/staging/tty/digi*
-
 DIOLAN U2C-12 I2C DRIVER
 M:      Guenter Roeck <guenter.roeck@ericsson.com>
 L:      linux-i2c@vger.kernel.org
@@ -5555,11 +5535,6 @@ M:	Maxim Levitsky <maximlevitsky@gmail.com>
 S:      Maintained
 F:      drivers/memstick/host/r592.*
 
-RISCOM8 DRIVER
-S:      Orphan
-F:      Documentation/serial/riscom8.txt
-F:      drivers/staging/tty/riscom8*
-
 ROCKETPORT DRIVER
 P:      Comtrol Corp.
 W:      http://www.comtrol.com
@@ -6222,11 +6197,6 @@ F:	arch/arm/mach-spear3xx/spear3*0_evb.c
 F:      arch/arm/mach-spear6xx/spear600.c
 F:      arch/arm/mach-spear6xx/spear600_evb.c
 
-SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
-S:      Orphan
-F:      Documentation/serial/specialix.txt
-F:      drivers/staging/tty/specialix*
-
 SPI SUBSYSTEM
 M:      Grant Likely <grant.likely@secretlab.ca>
 L:      spi-devel-general@lists.sourceforge.net
@@ -6304,11 +6274,6 @@ M:	Manu Abraham <abraham.manu@gmail.com>
 S:      Odd Fixes
 F:      drivers/staging/crystalhd/
 
-STAGING - CYPRESS WESTBRIDGE SUPPORT
-M:      David Cross <david.cross@cypress.com>
-S:      Odd Fixes
-F:      drivers/staging/westbridge/
-
 STAGING - ECHO CANCELLER
 M:      Steve Underwood <steveu@coppice.org>
 M:      David Rowe <david@rowetel.com>
@@ -6414,7 +6379,7 @@ S:	Odd Fixes
 F:      drivers/staging/winbond/
 
 STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
-M:      Arnaud Patard <apatard@mandriva.com>
+M:      Arnaud Patard <arnaud.patard@rtp-net.org>
 S:      Odd Fixes
 F:      drivers/staging/xgifb/