Merge tag 'staging-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging and IIO driver fixes from Greg KH:
 "Here are some IIO driver fixes, along with two staging driver fixes
  for 4.6-rc3.

  One staging driver patch reverts the deletion of a driver that
  happened in 4.6-rc1.  We thought that laptop.org was dead, but it's
  still alive and kicking, and has users that were mad we broke their
  hardware by deleting a driver for their machines.  So that driver is
  added back and everyone is happy again.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  Revert "Staging: olpc_dcon: Remove obsolete driver"
  staging/rdma/hfi1: select CRC32
  iio: gyro: bmg160: fix buffer read values
  iio: gyro: bmg160: fix endianness when reading axes
  iio: accel: bmc150: fix endianness when reading axes
  iio: st_magn: always define ST_MAGN_TRIGGER_SET_STATE
  iio: fix config watermark initial value
  iio: health: max30100: correct FIFO check condition
  iio: imu: Fix inv_mpu6050 dependencies
  iio: adc: Fix build error of missing devm_ioremap_resource on UM
  iio: light: apds9960: correct FIFO check condition
  iio: adc: max1363: correct reference voltage
  iio: adc: max1363: add missing adc to max1363_id

diff --combined MAINTAINERS
index 24997a7c0bbee6a5414590a654ec45886820d170,6cd7a5c6adcaf567aa2649e6b3afa4a81fe8a9d5..61a323a6b2cfe7348c63f49eadcd858100dc8a03
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4302,7 -4302,7 +4302,7 @@@ F:      drivers/net/ethernet/agere
  
  ETHERNET BRIDGE
  M:    Stephen Hemminger <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net:Bridge
  S:    Maintained
@@@ -5042,7 -5042,6 +5042,7 @@@ F:      include/linux/hw_random.
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <[email protected]>
  M:    Bjorn Andersson <[email protected]>
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
  F:    Documentation/hwspinlock.txt
@@@ -5751,7 -5750,7 +5751,7 @@@ R:      Don Skidmore <donald.c.skidmore@inte
  R:    Bruce Allan <[email protected]>
  R:    John Ronciak <[email protected]>
  R:    Mitch Williams <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
  Q:    http://patchwork.ozlabs.org/project/intel-wired-lan/list/
@@@ -6403,7 -6402,7 +6403,7 @@@ KPROBE
  M:    Ananth N Mavinakayanahalli <[email protected]>
  M:    Anil S Keshavamurthy <[email protected]>
  M:    "David S. Miller" <[email protected]>
 -M:    Masami Hiramatsu <m[email protected]>
 +M:    Masami Hiramatsu <m[email protected]>
  S:    Maintained
  F:    Documentation/kprobes.txt
  F:    include/linux/kprobes.h
@@@ -7576,7 -7575,7 +7576,7 @@@ F:      drivers/infiniband/hw/nes
  
  NETEM NETWORK EMULATOR
  M:    Stephen Hemminger <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    net/sched/sch_netem.c
  
@@@ -8254,7 -8253,7 +8254,7 @@@ F:      Documentation/filesystems/overlayfs.
  
  ORANGEFS FILESYSTEM
  M:    Mike Marshall <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (subscribers-only)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
  S:    Supported
  F:    fs/orangefs/
@@@ -8712,8 -8711,6 +8712,8 @@@ F:      drivers/pinctrl/sh-pfc
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -9142,13 -9139,6 +9142,13 @@@ T:    git git://github.com/KrasnikovEugene
  S:    Supported
  F:    drivers/net/wireless/ath/wcn36xx/
  
 +QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
 +M:    Gabriel Somlo <[email protected]>
 +M:    "Michael S. Tsirkin" <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/qemu_fw_cfg.c
 +
  RADOS BLOCK DEVICE (RBD)
  M:    Ilya Dryomov <[email protected]>
  M:    Sage Weil <[email protected]>
@@@ -9324,7 -9314,6 +9324,7 @@@ F:      include/linux/regmap.
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
  M:    Ohad Ben-Cohen <[email protected]>
  M:    Bjorn Andersson <[email protected]>
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
  S:    Maintained
  F:    drivers/remoteproc/
@@@ -9334,7 -9323,6 +9334,7 @@@ F:      include/linux/remoteproc.
  REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
  M:    Ohad Ben-Cohen <[email protected]>
  M:    Bjorn Andersson <[email protected]>
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
  S:    Maintained
  F:    drivers/rpmsg/
@@@ -10595,6 -10583,14 +10595,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/staging/nvec/
  
+ STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
+ M:    Jens Frederich <[email protected]>
+ M:    Daniel Drake <[email protected]>
+ M:    Jon Nettleton <[email protected]>
+ W:    http://wiki.laptop.org/go/DCON
+ S:    Maintained
+ F:    drivers/staging/olpc_dcon/
+ 
  STAGING - REALTEK RTL8712U DRIVERS
  M:    Larry Finger <[email protected]>
  M:    Florian Schilhabel <[email protected]>.
@@@ -11149,8 -11145,8 +11157,8 @@@ F:   include/uapi/linux/tipc*.
  F:    net/tipc/
  
  TILE ARCHITECTURE
 -M:    Chris Metcalf <cmetcalf@ezchip.com>
 -W:    http://www.ezchip.com/scm/
 +M:    Chris Metcalf <cmetcalf@mellanox.com>
 +W:    http://www.mellanox.com/repository/solutions/tile-scm/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
  S:    Supported
  F:    arch/tile/
@@@ -12214,9 -12210,9 +12222,9 @@@ S:   Maintaine
  F:    drivers/media/tuners/tuner-xc2028.*
  
  XEN HYPERVISOR INTERFACE
 -M:    Konrad Rzeszutek Wilk <[email protected]>
  M:    Boris Ostrovsky <[email protected]>
  M:    David Vrabel <[email protected]>
 +M:    Juergen Gross <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
  S:    Supported
@@@ -12228,16 -12224,16 +12236,16 @@@ F:        include/xen
  F:    include/uapi/xen/
  
  XEN HYPERVISOR ARM
 -M:    Stefano Stabellini <s[email protected]>
 +M:    Stefano Stabellini <s[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  F:    arch/arm/xen/
  F:    arch/arm/include/asm/xen/
  
  XEN HYPERVISOR ARM64
 -M:    Stefano Stabellini <s[email protected]>
 +M:    Stefano Stabellini <s[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  F:    arch/arm64/xen/
  F:    arch/arm64/include/asm/xen/