From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Apr 2008 18:25:37 +0000 (-0700)
Subject: Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
X-Git-Tag: v2.6.25-rc8~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f4cfbaa2bede7d371ea2e589e87c6881235a711;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
  hwmon: (w83781d) Fix I/O resource conflict with PNP
---

1f4cfbaa2bede7d371ea2e589e87c6881235a711