Merge branch 'cpu-package-thermal' of .git into next

Conflicts:
	drivers/thermal/Kconfig
	drivers/thermal/Makefile

diff --cc drivers/thermal/Kconfig
index 7205c70,245831c..b13c2bc
--- 1/drivers/thermal/Kconfig
--- 2/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@@ -169,7 -169,16 +169,20 @@@ config INTEL_POWERCLAM
          enforce idle time which results in more package C-state residency. The
          user interface is exposed via generic thermal framework.
  
+ config X86_PKG_TEMP_THERMAL
+       tristate "X86 package temperature thermal driver"
+       depends on THERMAL
+       depends on X86
+       select THERMAL_GOV_USER_SPACE
+       default m
+       help
+         Enable this to register CPU digital sensor for package temperature as
+         thermal zone. Each package will have its own thermal zone. There are
+         two trip points which can be set by user to get notifications via thermal
+         notification methods.
+ 
 +menu "Texas Instruments thermal drivers"
 +source "drivers/thermal/ti-soc-thermal/Kconfig"
 +endmenu
++
  endif

diff --cc drivers/thermal/Makefile
index 8569394,b1cefb8..67184a2
--- 1/drivers/thermal/Makefile
--- 2/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@@ -23,4 -23,4 +23,5 @@@ obj-$(CONFIG_DB8500_THERMAL)  += db8500_
  obj-$(CONFIG_ARMADA_THERMAL)  += armada_thermal.o
  obj-$(CONFIG_DB8500_CPUFREQ_COOLING)  += db8500_cpufreq_cooling.o
  obj-$(CONFIG_INTEL_POWERCLAMP)        += intel_powerclamp.o
+ obj-$(CONFIG_X86_PKG_TEMP_THERMAL)    += x86_pkg_temp_thermal.o
 +obj-$(CONFIG_TI_SOC_THERMAL)  += ti-soc-thermal/