diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:17:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 12:17:00 -0700 |
| commit | 150cd843fac0160fce616fb3e5cbe64e9db7481e (patch) | |
| tree | eca7ed23a2238665462ff92fe6e9b591da3e092a /MAINTAINERS | |
| parent | f063a0c0c995d010960efcc1b2ed14b99674f25c (diff) | |
| parent | 44c1bcd4bcde32b2a31a6775a277706ab489c0dc (diff) | |
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
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ba9480edf8fd..d0c2206fd632 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -432,7 +432,7 @@ AMS (Apple Motion Sensor) DRIVER 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> @@ -6465,6 +6465,12 @@ S: Maintained 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 |