From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Apr 2012 19:19:41 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6e1173399d09aa7ab5db613911e38700b2307ece;p=openwrt%2Fstaging%2Fblogic.git

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

Pull hwmon patches from Guenter Roeck:
 "Fix build warnings in four drivers"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (pmbus_core) Fix compiler warning
  hwmon: (smsc47m1) Fix compiler warning
  hwmon: (acpi_power_meter) Fix compiler warning seen in some configurations
  hwmon: (smsc47b397) Fix compiler warning
---

6e1173399d09aa7ab5db613911e38700b2307ece