summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-11 16:13:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-11 16:13:47 -0700
commit9ebd051a7d5aa7b0ce813c3c2e5b9c851e7774b9 (patch)
tree5bc54f2de4312e5fe13356779c7bf49132e2a3fd /drivers/usb
parent51a73ba5f409ef6f419c8ec3a0d1257633500aaa (diff)
parent5a924a07f882e866f2337bf65048be357956691a (diff)
downloadblackbird-op-linux-9ebd051a7d5aa7b0ce813c3c2e5b9c851e7774b9.tar.gz
blackbird-op-linux-9ebd051a7d5aa7b0ce813c3c2e5b9c851e7774b9.zip
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
Diffstat (limited to 'drivers/usb')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud