tree 32a319dbb68519faca1357916e34f1e63c953fd1
parent f385b6974bf93cd4335495437a6ee82fa5237df7
parent b4cb0d4da745bc1d806b9b4a27cc4ce1f7adbf99
author Linus Torvalds <torvalds@linux-foundation.org> 1314293500 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1314293500 -0700

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