diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 09:58:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 09:58:10 -0700 |
| commit | 76c97e6c754885a3168becfa4a6aa47c7e8ea6a6 (patch) | |
| tree | c6a333a7f302fb648282243dd93783bb5c47517c /include/net/esp.h | |
| parent | 8da8533dfb0929c5ea5d9fdf60ea6d3ffa02127d (diff) | |
| parent | 829917cd7246204d6c5f066c40b66d2b62d0930d (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'include/net/esp.h')
0 files changed, 0 insertions, 0 deletions