diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-08 04:30:37 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-08 04:30:37 +0300 |
| commit | ea8dc1abeb09b401bdaea39cfb9850c80f8ef3ef (patch) | |
| tree | bc84f76679078c248feeb20c646952fc164ac28d /sound/firewire/fireworks/fireworks_stream.c | |
| parent | d5a8ab400bf15d673f1791e250f08699a4d9f8bd (diff) | |
| parent | de66b380977eb9daa925aeb21756a9b00f700e45 (diff) | |
Merge tag 'hwmon-for-linus-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- Export module alias information in g762 and nct7904 to support
auto-loading.
- Blacklist Dell Studio XPS 8100 in dell-smm to fix fan control
problems.
* tag 'hwmon-for-linus-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (g762) Export OF module alias information
hwmon: (nct7904) Export I2C module alias information
hwmon: (dell-smm) Blacklist Dell Studio XPS 8100
Diffstat (limited to 'sound/firewire/fireworks/fireworks_stream.c')
0 files changed, 0 insertions, 0 deletions