From: Linus Torvalds 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-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1f4cfbaa2bede7d371ea2e589e87c6881235a711;p=openwrt%2Fstaging%2Fblogic.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