]> rtime.felk.cvut.cz Git - linux-imx.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)
commite5b1d9cc1dc7cf76147411f1a74f64b570e148e3
tree32a319dbb68519faca1357916e34f1e63c953fd1
parentf385b6974bf93cd4335495437a6ee82fa5237df7
parentb4cb0d4da745bc1d806b9b4a27cc4ce1f7adbf99
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