From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Nov 2014 21:18:20 +0000 (-0800)
Subject: Merge tag 'hwmon-for-linus-v3.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: omap-for-v3.19/fixes-for-merge-window~132
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de34b81bc2d034c9ba8d6b276725f975e728270a;p=pandora-kernel.git

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

Pull hwmon fixes from Guenter Roeck:
 - fix PCI device ID in fam15h_power driver
 - fix suspend/resume behavior in pwm-fan driver
 - reduce logging noise created by ibmpowernv driver

* tag 'hwmon-for-linus-v3.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (fam15h_power) Fix NB device ID for F16h M30h
  hwmon: (pwm-fan) Fix suspend/resume behavior
  hwmon: (ibmpowernv) Quieten when probing finds no device
---

de34b81bc2d034c9ba8d6b276725f975e728270a