From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Oct 2012 18:48:32 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: submit/tizen_common/20140905.094502~4187
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e80bd270ec2838699fd598844fe20d20c2b766dd;p=sdk%2Femulator%2Femulator-kernel.git

Merge tag 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "Drop some leftover dependencies on CONFIG_EXPERIMENTAL, and add
  support for Intel Atom CE4110/4150/4170."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (coretemp) Add support for Atom CE4110/4150/4170
  Documentation/hwmon: remove CONFIG_EXPERIMENTAL
  hwmon: (pmbus) remove CONFIG_EXPERIMENTAL
---

e80bd270ec2838699fd598844fe20d20c2b766dd