Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 May 2009 23:25:00 +0000 (16:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 May 2009 23:25:00 +0000 (16:25 -0700)
commit825118d1f1ce577224a3e668960717d8fc8ac44e
tree56d9308c36aee10da43e358c75e2f42a80d9f539
parentb20a4e9483df7469359f0c7f3f70bd2f5b78677f
parent848ddf116b3d1711c956fac8627be12dfe8d736f
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:
  hwmon: (w83781d) Fix W83782D support (NULL pointer dereference)
  hwmon: (asus_atk0110) Fix compiler warning