Linus Torvalds 9ebd051a7d Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux ... Pull thermal updates from Zhang Rui: - use int instead of unsigned long to represent temperature to avoid bogus overheat detection when negative temperature reported. From Sascha Hauer. - export available thermal governors information to user space via sysfs. From Wei Ni. - introduce new thermal driver for Wildcat Point platform controller hub, which uses PCH thermal sensor and associated critical and hot trip points. From Tushar Dave. - add suuport for Intel Skylake and Denlow platforms in powerclamp driver. - some small cleanups in thermal core. * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal: Add Intel PCH thermal driver thermal: Add comment explaining test for critical temperature thermal: Use IS_ENABLED instead of #ifdef thermal: remove unnecessary call to thermal_zone_device_set_polling thermal: trivial: fix typo in comment thermal: consistently use int for temperatures thermal: add available policies sysfs attribute thermal/powerclamp: add cpu id for denlow platform thermal/powerclamp: add cpu id for Skylake u/y thermal/powerclamp: add cpu id for skylake h/s		2015-09-11 16:13:47 -07:00
..
events	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2015-09-11 16:13:47 -07:00
define_trace.h	tracing: Move the perf code out of trace_event.h	2015-05-13 14:05:10 -04:00
perf.h	tracing: Rename ftrace_get_offsets_##call() to trace_event_get_offsets_##call()	2015-05-13 21:49:01 -04:00
syscall.h	tracing: Rename ftrace_event_{call,class} to trace_event_{call,class}	2015-05-13 14:06:10 -04:00
trace_events.h	tracing: Rename ftrace_get_offsets_##call() to trace_event_get_offsets_##call()	2015-05-13 21:49:01 -04:00