From: Zhang Rui <rui.zhang@intel.com>
Date: Thu, 11 Jun 2015 04:52:14 +0000 (+0800)
Subject: Merge branches 'release' and 'thermal-soc' of .git into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=111b23cf895b5cbcdc1b2c6580be1bb78a577d05;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branches 'release' and 'thermal-soc' of .git into next
---

111b23cf895b5cbcdc1b2c6580be1bb78a577d05
diff --cc drivers/thermal/intel_powerclamp.c
index e34ccd5b1ba0,725718e97a0b..2e6716104d3f
--- a/drivers/thermal/intel_powerclamp.c
+++ b/drivers/thermal/intel_powerclamp.c
@@@ -689,8 -695,8 +695,9 @@@ static const struct x86_cpu_id intel_po
  	{ X86_VENDOR_INTEL, 6, 0x46},
  	{ X86_VENDOR_INTEL, 6, 0x4c},
  	{ X86_VENDOR_INTEL, 6, 0x4d},
+ 	{ X86_VENDOR_INTEL, 6, 0x4f},
  	{ X86_VENDOR_INTEL, 6, 0x56},
 +	{ X86_VENDOR_INTEL, 6, 0x57},
  	{}
  };
  MODULE_DEVICE_TABLE(x86cpu, intel_powerclamp_ids);