From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 May 2009 23:25:00 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
X-Git-Tag: v2.6.30-rc5~3
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=825118d1f1ce577224a3e668960717d8fc8ac44e;p=safe%2Fjmp%2Flinux-2.6

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
---

825118d1f1ce577224a3e668960717d8fc8ac44e