tree 56d9308c36aee10da43e358c75e2f42a80d9f539
parent b20a4e9483df7469359f0c7f3f70bd2f5b78677f
parent 848ddf116b3d1711c956fac8627be12dfe8d736f
author Linus Torvalds <torvalds@linux-foundation.org> 1241825100 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241825100 -0700

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