From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Apr 2012 02:50:56 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: Ubuntu-5.2.0-15.16~18176
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44;p=mirror_ubuntu-eoan-kernel.git

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

Pull hwmon patches from Guenter Roeck:
 - Fix build warning in ad7314 driver
 - Fix pci_device_id array access in fam15h_power driver, introduced by
   commit 00250ec90963 ("hwmon: fam15h_power: fix bogus values with
   current BIOSes")

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (fam15h_power) Fix pci_device_id array
  hwmon: (ad7314) Fix build warning
---

9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44