diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:14:15 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:14:15 -0800 |
commit | 59dad0cbe6fd52e68b1ee4b02cbf89d64a4655cc (patch) | |
tree | 8ad125b55c285522e629025b6958f61960e5625e /MAINTAINERS | |
parent | 1024d1c24bb3f2c4dc568d96d3b5e22ea5865481 (diff) | |
parent | 211e3e0e1b116b10ba707db2fec972909fa647fd (diff) | |
download | linux-stable-59dad0cbe6fd52e68b1ee4b02cbf89d64a4655cc.tar.gz linux-stable-59dad0cbe6fd52e68b1ee4b02cbf89d64a4655cc.tar.bz2 linux-stable-59dad0cbe6fd52e68b1ee4b02cbf89d64a4655cc.zip |
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
MAINTAINERS: Switch hdaps to Frank Seidel
hwmon: Fix ACPI resource check error handling
hwmon: (f71882fg) Hide misleading error message
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 53b50c8d5f38..e784b358b335 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1905,10 +1905,10 @@ W: http://gigaset307x.sourceforge.net/ S: Maintained HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER -P: Robert Love -M: rlove@rlove.org -M: linux-kernel@vger.kernel.org -W: http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/ +P: Frank Seidel +M: frank@f-seidel.de +L: lm-sensors@lm-sensors.org +W: http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/ S: Maintained GSPCA FINEPIX SUBDRIVER |