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)
commit59dad0cbe6fd52e68b1ee4b02cbf89d64a4655cc
tree8ad125b55c285522e629025b6958f61960e5625e
parent1024d1c24bb3f2c4dc568d96d3b5e22ea5865481
parent211e3e0e1b116b10ba707db2fec972909fa647fd
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
MAINTAINERS