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: v2.6.36-rc1~529
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=a5e11599da95fbe8425db0cfd01a581d7412d0c9;p=net-next-2.6.git

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

a5e11599da95fbe8425db0cfd01a581d7412d0c9