Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:14:15 +0000 (14:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:14:15 +0000 (14:14 -0800)
* '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

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 53b50c8d5f384991d03a51c1e23c134c5a62daf4,a654c5b9c2714fae1c068ea01e29a1671ddc6483..e784b358b33519a584729d99a7723de4e9497393
@@@ -1905,10 -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
@@@ -4924,11 -4924,11 +4924,11 @@@ L:   zd1211-devs@lists.sourceforge.net (s
  S:    Maintained
  
  ZR36067 VIDEO FOR LINUX DRIVER
 -P:    Ronald Bultje
 -M:    rbultje@ronald.bitfreak.net
  L:    mjpeg-users@lists.sourceforge.net
 +L:    linux-media@vger.kernel.org
  W:    http://mjpeg.sourceforge.net/driver-zoran/
 -S:    Maintained
 +T:    Mercurial http://linuxtv.org/hg/v4l-dvb
 +S:    Odd Fixes
  
  ZS DECSTATION Z85C30 SERIAL DRIVER
  P:    Maciej W. Rozycki