| commit | c12f667e7563c2c0e0908c997900b91b41b23592 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 06 17:48:02 2011 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 06 17:48:02 2011 +0900 |
| tree | add57171404be906a87e03820d9e0e5f31d53238 | |
| parent | 0792644d22852f40c8ad16c4ba1fefd76aba5643 [diff] | |
| parent | 942c1a927bf296fd64fd49f04c5a8f66bb14446b [diff] |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon: (max6642): Better chip detection schema hwmon: (coretemp) Further relax temperature range checks hwmon: (coretemp) Fix TjMax detection for older CPUs hwmon: (coretemp) Relax target temperature range check hwmon: (max6642) Rename temp_fault sysfs attribute to temp2_fault