diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:39:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:39:38 -0700 |
| commit | d94b20497b419e8394654f995f94742bd6b06640 (patch) | |
| tree | 73335fd96e4120fed9d1284a199030c4df449e0e /sound/pci/asihpi/hpi6205.c | |
| parent | 064c946a0cda77057277d5758f259b54484cfc5a (diff) | |
| parent | cd4de21f7e65a8cd04860f5661b3c18648ee52a1 (diff) | |
| download | linux-d94b20497b419e8394654f995f94742bd6b06640.tar.gz linux-d94b20497b419e8394654f995f94742bd6b06640.tar.bz2 linux-d94b20497b419e8394654f995f94742bd6b06640.zip | |
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:
hwmon: (k8temp) Bypass core swapping on single-core processors
hwmon: (i5k_amb) Fix sysfs attribute for lockdep
hwmon: (k10temp) Do not blacklist known working CPU models
Diffstat (limited to 'sound/pci/asihpi/hpi6205.c')
0 files changed, 0 insertions, 0 deletions