From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Jun 2010 14:39:38 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: 2.1b_release~7789
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d94b20497b419e8394654f995f94742bd6b06640;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (k8temp) Bypass core swapping on single-core processors
  hwmon: (i5k_amb) Fix sysfs attribute for lockdep
  hwmon: (k10temp) Do not blacklist known working CPU models
---

d94b20497b419e8394654f995f94742bd6b06640