Merge branch 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --combined drivers/hwmon/Kconfig
index c57e530d07c75d1bd8472f22370274e86d3022ff,3a858e854356878b8df3925566ed22e17b3d33e7..4d382ae530923c5e0d90bbb4d043b3d7da5c4a26
--- 1/drivers/hwmon/Kconfig
--- 2/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@@ -407,6 -407,13 +407,13 @@@ config SENSORS_CORETEM
          sensor inside your CPU. Most of the family 6 CPUs
          are supported. Check documentation/driver for details.
  
+ config SENSORS_PKGTEMP
+       tristate "Intel processor package temperature sensor"
+       depends on X86 && PCI && EXPERIMENTAL
+       help
+         If you say yes here you get support for the package level temperature
+         sensor inside your CPU. Check documentation/driver for details.
+ 
  config SENSORS_IBMAEM
        tristate "IBM Active Energy Manager temperature/power sensors and control"
        select IPMI_SI
@@@ -446,16 -453,6 +453,16 @@@ config SENSORS_IT8
          This driver can also be built as a module.  If so, the module
          will be called it87.
  
 +config SENSORS_JZ4740
 +      tristate "Ingenic JZ4740 SoC ADC driver"
 +      depends on MACH_JZ4740 && MFD_JZ4740_ADC
 +      help
 +        If you say yes here you get support for reading adc values from the ADCIN
 +        pin on Ingenic JZ4740 SoC based boards.
 +
 +        This driver can also be build as a module. If so, the module will be
 +        called jz4740-hwmon.
 +
  config SENSORS_LM63
        tristate "National Semiconductor LM63 and LM64"
        depends on I2C

diff --combined drivers/hwmon/Makefile
index c5057745b068351932ba4fe01a462041c92cfee1,879814e608785ed7f734437a1f7ea0f7f2dd69a7..9103bd6ea73aa0755b9754467e0a4bd7b608bd7b
--- 1/drivers/hwmon/Makefile
--- 2/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@@ -39,6 -39,7 +39,7 @@@ obj-$(CONFIG_SENSORS_AMS)     += ams
  obj-$(CONFIG_SENSORS_ASC7621) += asc7621.o
  obj-$(CONFIG_SENSORS_ATXP1)   += atxp1.o
  obj-$(CONFIG_SENSORS_CORETEMP)        += coretemp.o
+ obj-$(CONFIG_SENSORS_PKGTEMP) += pkgtemp.o
  obj-$(CONFIG_SENSORS_DME1737) += dme1737.o
  obj-$(CONFIG_SENSORS_DS1621)  += ds1621.o
  obj-$(CONFIG_SENSORS_EMC1403) += emc1403.o
@@@ -55,7 -56,6 +56,7 @@@ obj-$(CONFIG_SENSORS_I5K_AMB) += i5k_am
  obj-$(CONFIG_SENSORS_IBMAEM)  += ibmaem.o
  obj-$(CONFIG_SENSORS_IBMPEX)  += ibmpex.o
  obj-$(CONFIG_SENSORS_IT87)    += it87.o
 +obj-$(CONFIG_SENSORS_JZ4740)  += jz4740-hwmon.o
  obj-$(CONFIG_SENSORS_K8TEMP)  += k8temp.o
  obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o
  obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o