Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F
  hwmon: (sht15) fix bad error code
  MAINTAINERS: Drop maintainer for MAX1668 hwmon driver
  MAINTAINERS: Add hwmon entries for Wolfson
  hwmon: (f71805f) Fix clamping of temperature limits

diff --combined MAINTAINERS
index 2bd630d9a103ace896ddadb4ab828ec97928723d,686c652e1ae1dec789ec2a981f778a999851a2cf..6803338dc88504fb890c8438bc1868efabf80b64
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2246,17 -2246,6 +2246,17 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    fs/dlm/
  
 +DMA BUFFER SHARING FRAMEWORK
 +M:    Sumit Semwal <[email protected]>
 +S:    Maintained
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +F:    drivers/base/dma-buf*
 +F:    include/linux/dma-buf*
 +F:    Documentation/dma-buf-sharing.txt
 +T:    git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
 +
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <[email protected]>
  M:    Dan Williams <[email protected]>
@@@ -2350,9 -2339,6 +2350,9 @@@ F:      include/drm/i915
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
 +M:    Joonyoung Shim <[email protected]>
 +M:    Seung-Woo Kim <[email protected]>
 +M:    Kyungmin Park <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/gpu/drm/exynos
@@@ -2405,7 -2391,7 +2405,7 @@@ F:      net/bridge/netfilter/ebt*.
  
  ECRYPT FILE SYSTEM
  M:    Tyler Hicks <[email protected]>
 -M:    Dustin Kirkland <kirkland@canonical.com>
 +M:    Dustin Kirkland <dustin.kirkland@gazzang.com>
  L:    [email protected]
  W:    https://launchpad.net/ecryptfs
  S:    Supported
@@@ -4281,13 -4267,6 +4281,6 @@@ S:     Orpha
  F:    drivers/video/matrox/matroxfb_*
  F:    include/linux/matroxfb.h
  
- MAX1668 TEMPERATURE SENSOR DRIVER
- M:    "David George" <[email protected]>
- L:    [email protected]
- S:    Maintained
- F:    Documentation/hwmon/max1668
- F:    drivers/hwmon/max1668.c
- 
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    "Hans J. Koch" <[email protected]>
  L:    [email protected]
@@@ -6678,7 -6657,7 +6671,7 @@@ TTY LAYE
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 -F:    drivers/tty/*
 +F:    drivers/tty/
  F:    drivers/tty/serial/serial_core.c
  F:    include/linux/serial_core.h
  F:    include/linux/serial.h
@@@ -7371,6 -7350,7 +7364,7 @@@ S:      Supporte
  F:    Documentation/hwmon/wm83??
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
  F:    drivers/leds/leds-wm83*.c
+ F:    drivers/hwmon/wm83??-hwmon.c
  F:    drivers/input/misc/wm831x-on.c
  F:    drivers/input/touchscreen/wm831x-ts.c
  F:    drivers/input/touchscreen/wm97*.c