summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-06 17:48:02 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-06 17:48:02 +0900
commitc12f667e7563c2c0e0908c997900b91b41b23592 (patch)
treeadd57171404be906a87e03820d9e0e5f31d53238 /Makefile
parent0792644d22852f40c8ad16c4ba1fefd76aba5643 (diff)
parent942c1a927bf296fd64fd49f04c5a8f66bb14446b (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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions