From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Aug 2011 17:31:40 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Tag: v3.1-rc4~42
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e5b1d9cc1dc7cf76147411f1a74f64b570e148e3;p=linux.git

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
---

e5b1d9cc1dc7cf76147411f1a74f64b570e148e3