Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2010-06-27 07:39:38 -07:00

parent 064c946a0c cd4de21f7e

commit d94b20497b

3 changed files with 19 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

drivers/hwmon/i5k_amb.c

View file

14

drivers/hwmon/k10temp.c

View file

2

drivers/hwmon/k8temp.c

View file