From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Aug 2010 15:41:18 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: v2.6.36-rc3~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a559057b4fa0f60b2772fb590bf13e90af7a57d;p=platform%2Fupstream%2Fkernel-adaptation-pc.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:
  MAINTAINERS: hwmon/coretemp: Change maintainers
  hwmon: (k8temp) Differentiate between AM2 and ASB1
  hwmon: (ads7871) Fix ads7871_probe error paths
  hwmon: (coretemp) Fix harmless build warning
---

5a559057b4fa0f60b2772fb590bf13e90af7a57d