diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-12 10:49:47 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-10-12 10:49:47 +1100 |
| commit | bde1d7ad5c7d1431c130b3144c2f51ac5e5195af (patch) | |
| tree | 85ef273df545eaa09c5d792f34b30b740bc3dbb9 /MAINTAINERS | |
| parent | 20c61e943e19e572350973c994de2dec4751283d (diff) | |
| parent | 2250ee14319a73d61ea3bc5b4097af455b032cc8 (diff) | |
Merge branch 'quilt/jdelvare-hwmon'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f0d30211fbe7..58a35b81139a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -445,7 +445,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> @@ -2613,10 +2613,10 @@ F: drivers/net/greth* HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER M: Frank Seidel <frank@f-seidel.de> -L: lm-sensors@lm-sensors.org +L: platform-driver-x86@vger.kernel.org W: http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/ S: Maintained -F: drivers/hwmon/hdaps.c +F: drivers/platform/x86/hdaps.c HWPOISON MEMORY FAILURE HANDLING M: Andi Kleen <andi@firstfloor.org> |