diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-15 01:57:58 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-15 01:57:58 +0400 |
| commit | d310ad0c9d6354affc8abdcfb189ae1a434f18ae (patch) | |
| tree | b4daa9dc377e30087b6433a6ab95cc9ef0768528 /Documentation/acpi | |
| parent | c29c08b59875fe053471cf9eb66f8cfef39bc509 (diff) | |
| parent | f279941863f0d39fa8285b84449b52b8286a254b (diff) | |
| download | linux-d310ad0c9d6354affc8abdcfb189ae1a434f18ae.tar.xz | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (22 commits)
hwmon: (via-cputemp) Remove bogus "SHOW" global variable
hwmon: jc42 depends on I2C
hwmon: (pc87427) Add a maintainer
hwmon: (pc87427) Move sysfs file removal to a separate function
hwmon: (pc87427) Add temperature monitoring support
hwmon: (pc87427) Add support for the second logical device
hwmon: (pc87427) Add support for manual fan speed control
hwmon: (pc87427) Minor style cleanups
hwmon: (pc87427) Handle disabled fan inputs properly
hwmon: (w83627ehf) Add support for W83667HG-B
hwmon: (w83627ehf) Driver cleanup
hwmon: Add driver for SMSC EMC2103 temperature monitor and fan controller
hwmon: Remove in[0-*]_fault from sysfs-interface
hwmon: Add 4 current alarm/beep attributes to sysfs-interface
hwmon: Add 3 critical limit attributes to sysfs-interface
hwmon: (asc7621) Clean up and improve detect function
hwmon: (it87) Export labels for internal sensors
hwmon: (lm75) Add suspend/resume feature
hwmon: (emc1403) Add power support
hwmon: (ltc4245) Expose all GPIO pins as analog voltages
...
Diffstat (limited to 'Documentation/acpi')
0 files changed, 0 insertions, 0 deletions