]> git.baikalelectronics.ru Git - 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)
commit7890c257da825a0cb3d56d6258c7bc8593d6a404
tree87f11000d35f024c9473807b1f27ddf620a30f71
parent2b69aadc009c2202eedd32212514bc421c903af6
parent30c433ff9de16a3f721e827b129254a30eb72382
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