]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Apr 2008 18:25:37 +0000 (11:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Apr 2008 18:25:37 +0000 (11:25 -0700)
commit1f4cfbaa2bede7d371ea2e589e87c6881235a711
tree87f11000d35f024c9473807b1f27ddf620a30f71
parent90c9d4f8eeb9dd31adfb97e897039033b7a72d14
parent2961cb22ef02850d90e7a12c28a14d74e327df8d
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