diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 05:22:54 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-09 05:22:54 +0400 |
| commit | 42a6c7ef3b204ef9bfd0e5b65ccd8c67f4a6cedf (patch) | |
| tree | 8a27d307657140827268d5d0d6290d6475c7bd5e /arch/x86/pci/acpi.c | |
| parent | 5d0edf29151bb5ba372784b7e369f42cf23a94eb (diff) | |
| parent | 1bd612a25855f4cc9345052b53d7da697dba6358 (diff) | |
| download | linux-42a6c7ef3b204ef9bfd0e5b65ccd8c67f4a6cedf.tar.xz | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull four hwmon patches from Guenter Roeck
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (jc42) Add support for AT30TS00, TS3000GB2, TSE2002GB2, and MCP9804
hwmon: (zl6100) Maintain delay parameter in driver instance data
hwmon: (pmbus_core) Fix maximum number of POUT alarm attributes
hwmon: (jc42) Add support for ST Microelectronics STTS2002 and STTS3000
Diffstat (limited to 'arch/x86/pci/acpi.c')
0 files changed, 0 insertions, 0 deletions