| commit | a5e11599da95fbe8425db0cfd01a581d7412d0c9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 06 10:02:58 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 06 10:02:58 2010 -0700 |
| tree | 45fccb4b27a1068cec8dc8283260893b60ca46d2 | |
| parent | 0f477dd0851bdcee82923da66a7fc4a44cb1bc3d [diff] | |
| parent | a3159864f2978bf2ace9cc787d73d315c98bbf9a [diff] |
Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, hwmon: Package Level Thermal/Power: pkgtemp documentation x86, hwmon: Package Level Thermal/Power: power limit x86, hwmon: Package Level Thermal/Power: thermal throttling handler x86, hwmon: Package Level Thermal/Power: pkgtemp hwmon driver