From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Oct 2012 23:49:18 +0000 (+0900)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: v3.7-rc1~57
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e626d177fcb7d8eb759da49c652a68ff90a59fba;p=~emulex%2Finfiniband.git

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

Pull hwmon updates from Jean Delvare:
 "Only trivial things this time"

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: Drop needless includes of <linux/delay.h>
  hwmon: Add missing inclusions of <linux/err.h>
  hwmon: Add missing inclusions of <linux/jiffies.h>
  hwmon: Fix spelling of Celsius
  hwmon: Update Alexey Fisher's name
---

e626d177fcb7d8eb759da49c652a68ff90a59fba