From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Mar 2013 00:33:13 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: v3.12-rc1~1221
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92fbb1c9179052a81b74420d4695db2be9a5fe0e;p=kernel%2Fkernel-generic.git

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

Pull hwmon fixes from Guenter Roeck:
 "Bug fixes for pmbus, ltc2978, and lineage-pem drivers

  Added specific maintainer for some hwmon drivers"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (pmbus/ltc2978) Fix temperature reporting
  hwmon: (pmbus) Fix krealloc() misuse in pmbus_add_attribute()
  hwmon: (lineage-pem) Add missing terminating entry for pem_[input|fan]_attributes
  MAINTAINERS: Add maintainer for MAX6697, INA209, and INA2XX drivers
---

92fbb1c9179052a81b74420d4695db2be9a5fe0e