From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Jul 2012 16:58:10 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: firefly_0821_release~3680^2~2317
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=76c97e6c754885a3168becfa4a6aa47c7e8ea6a6;p=firefly-linux-kernel-4.4.55.git

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

Pull hwmon fixes from Guenter Roeck:

 - Fix timing problems in applesmc driver

 - Improve device removal in jc42 driver

 - Fix build warning in acp_power_meter driver

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (applesmc) Decode and act on read/write status codes
  hwmon: (jc42) Don't reset hysteresis on device removal
  hwmon: (jc42) Simplify hysteresis mask
  hwmon: (acpi_power_meter) Fix build warning
---

76c97e6c754885a3168becfa4a6aa47c7e8ea6a6