From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Apr 2014 23:53:37 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: v3.15-rc1~104
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3cf59142bcd391680beb6932838fe09a73947705;p=~emulex%2Finfiniband.git

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

Pull second round of hwmon updates from Guenter Roeck:
 "Add support for AMD F16 M30h processor to k10temp driver.

  This adds one more patch which had secondary dependencies.  The branch
  point is arbitrary, but I did run a full set of build and qemu tests
  on it.  While there are some new build failures (6 out of 122 in my
  builds), none are due to this commit"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (k10temp) Add support for AMD F16 M30h processor
---

3cf59142bcd391680beb6932838fe09a73947705