From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Aug 2010 17:02:58 +0000 (-0700)
Subject: Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~9833^2~1264
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a5e11599da95fbe8425db0cfd01a581d7412d0c9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-hwmon-for-linus' of git://git./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
---

a5e11599da95fbe8425db0cfd01a581d7412d0c9