Merge remote-tracking branch 'hwmon-staging/hwmon-next'

Conflicts:
	drivers/hwmon/coretemp.c

diff --cc drivers/hwmon/coretemp.c
index 2e5e2dc47eafdca62ae3513bee1e471cbdb1276d,be58da122c9699ef4af196913ba6d8a3e5da5f64..78be66176840d1c6abdf29dd632d7a107f6ad2d3
--- 1/drivers/hwmon/coretemp.c
--- 2/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@@ -316,7 -317,20 +316,19 @@@ static int adjust_tjmax(struct cpuinfo_
        return tjmax;
  }
  
 -static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id,
 -                             struct device *dev)
+ static bool cpu_has_tjmax(struct cpuinfo_x86 *c)
+ {
+       u8 model = c->x86_model;
+ 
+       return model > 0xe &&
+              model != 0x1c &&
+              model != 0x26 &&
+              model != 0x27 &&
+              model != 0x35 &&
+              model != 0x36;
+ }
+ 
 +static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
  {
        int err;
        u32 eax, edx;