commit 6e1173399d09aa7ab5db613911e38700b2307ece
author Linus Torvalds <torvalds@linux-foundation.org> Fri Apr 13 12:19:41 2012 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Apr 13 12:19:41 2012 -0700
tree a86e7a294f5648dbc531c9590094492b887fea90
parent 461c14917e04f76d5efc63ce079798d4ca6c297f
parent d7ee11157f1fce02632e2f3a56b99b2afd9e5f93

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 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