From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 May 2010 00:38:04 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: v2.6.34~31
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=cea0d767c29669bf89f86e4aee46ef462d2ebae8

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: (applesmc) Correct sysfs fan error handling
  hwmon: (asc7621) Bug fixes
---

cea0d767c29669bf89f86e4aee46ef462d2ebae8