]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Aug 2011 17:31:40 +0000 (10:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Aug 2011 17:31:40 +0000 (10:31 -0700)
commit7f37b6f512db11223988750415c5c28cabe6d8c4
tree32a319dbb68519faca1357916e34f1e63c953fd1
parente04b11373ab8847f7b6d9656bb62f8aff0f7a84d
parent4751046536c687f1596d269dbf14eed628c7bf70
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (i5k_amb) Drop i5k_channel_pci_id
  hwmon: (ntc_thermistor) Simplify if sequence