From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 May 2012 00:08:58 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=913a90416918a591e6d5ece036b795c58a08131d;p=~shefty%2Frdma-dev.git

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

Pull hwmon fixes from Guenter Roeck:
 "Fix OOPS seen in coretemp driver if the CPU core ID is too large"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (coretemp) Increase CPU core limit
  hwmon: (coretemp) fix oops on cpu unplug
---

913a90416918a591e6d5ece036b795c58a08131d