| commit | 1f4cfbaa2bede7d371ea2e589e87c6881235a711 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 01 11:25:37 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 01 11:25:37 2008 -0700 |
| tree | 87f11000d35f024c9473807b1f27ddf620a30f71 | |
| parent | 90c9d4f8eeb9dd31adfb97e897039033b7a72d14 [diff] | |
| parent | 2961cb22ef02850d90e7a12c28a14d74e327df8d [diff] |
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