From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Nov 2012 20:27:52 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: v3.7-rc4~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae41fce3cce96b21ae821095654f9d796eae2452;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

Pull hwmon fixes from Guenter Roeck:
 "An e-mail address update, and fix a compile error on SPARC"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: Only include of_match_table with CONFIG_OF_GPIO
  hwmon, fam15h_power: Change email address, MAINTAINERS entry
---

ae41fce3cce96b21ae821095654f9d796eae2452