From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 19:17:00 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: v2.6.37-rc1~59
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=150cd843fac0160fce616fb3e5cbe64e9db7481e;hp=-c;p=net-next-2.6.git

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (68 commits)
  hwmon: (it87) Add support for the IT8721F/IT8758E
  hwmon: (it87) Move conversion functions
  hwmon: Remove many EXPERIMENTAL flags
  hwmon: (lm85) Add support for ADT7468 high-frequency PWM mode
  hwmon: (lm85) Document the ADT7468 as supported
  hwmon: (lm85) Fix ADT7468 frequency table
  hwmon: I2C addresses are constant
  Move ams driver to macintosh
  hwmon: (pcf8591) Don't attempt to detect devices
  hwmon: (pcf8591) Register as a hwmon device
  hwmon: (w83795) Use standard attributes for chassis intrusion
  hwmon: (w83795) Exclude fan control feature by default
  hwmon: (w83795) Add myself as co-author and maintainer
  hwmon: (w83795) More style cleanups
  hwmon: (w83795) Fix LSB reading of voltage limits
  hwmon: (w83795) Use dev_get_drvdata() where possible
  hwmon: (w83795) Delay reading pwm config registers
  hwmon: (w83795) Delay reading limit registers
  hwmon: (w83795) Move register reads to dedicated functions
  hwmon: (w83795) Pack similar register reads
  ...
---

150cd843fac0160fce616fb3e5cbe64e9db7481e
diff --combined MAINTAINERS
index ba9480edf8f,49e88f3872c..d0c2206fd63
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -432,7 -432,7 +432,7 @@@ AMS (Apple Motion Sensor) DRIVE
  M:	Stelian Pop <stelian@popies.net>
  M:	Michael Hanselmann <linux-kernel@hansmi.ch>
  S:	Supported
- F:	drivers/hwmon/ams/
+ F:	drivers/macintosh/ams/
  
  AMSO1100 RNIC DRIVER
  M:	Tom Tucker <tom@opengridcomputing.com>
@@@ -1391,14 -1391,6 +1391,14 @@@ L:	netdev@vger.kernel.or
  S:	Supported
  F:	drivers/net/tg3.*
  
 +BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
 +M:	Brett Rudley <brudley@broadcom.com>
 +M:	Henry Ptasinski <henryp@broadcom.com>
 +M:	Nohee Ko <noheek@broadcom.com>
 +L:	linux-wireless@vger.kernel.org
 +S:	Supported
 +F:	drivers/staging/brcm80211/
 +
  BROCADE BFA FC SCSI DRIVER
  M:	Jing Huang <huangj@brocade.com>
  L:	linux-scsi@vger.kernel.org
@@@ -3391,8 -3383,8 +3391,8 @@@ F:	Documentation/kdump
  KERNEL AUTOMOUNTER (AUTOFS)
  M:	"H. Peter Anvin" <hpa@zytor.com>
  L:	autofs@linux.kernel.org
 -S:	Odd Fixes
 -F:	fs/autofs/
 +S:	Obsolete
 +F:	drivers/staging/autofs/
  
  KERNEL AUTOMOUNTER v4 (AUTOFS4)
  M:	Ian Kent <raven@themaw.net>
@@@ -5675,7 -5667,7 +5675,7 @@@ S:	Maintaine
  
  STAGING SUBSYSTEM
  M:	Greg Kroah-Hartman <gregkh@suse.de>
 -T:	quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git
  L:	devel@driverdev.osuosl.org
  S:	Maintained
  F:	drivers/staging/
@@@ -6465,6 -6457,12 +6465,12 @@@ S:	Maintaine
  F:	Documentation/hwmon/w83793
  F:	drivers/hwmon/w83793.c
  
+ W83795 HARDWARE MONITORING DRIVER
+ M:	Jean Delvare <khali@linux-fr.org>
+ L:	lm-sensors@lm-sensors.org
+ S:	Maintained
+ F:	drivers/hwmon/w83795.c
+ 
  W83L51xD SD/MMC CARD INTERFACE DRIVER
  M:	Pierre Ossman <pierre@ossman.eu>
  S:	Maintained