summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-06-12 15:30:39 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-12 15:30:39 +0200
commit57120fac12321f636c83af447a081d680c0de2e2 (patch)
tree4b502f4f2b7e15bc012ff8b95884c32372b6687d /include/scsi
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-block (diff)
parentthermal: add the note for set_trip_temp (diff)
downloadlinux-57120fac12321f636c83af447a081d680c0de2e2.tar.xz
linux-57120fac12321f636c83af447a081d680c0de2e2.zip
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fixes from Zhang Rui: - fix an ordering issue in cpu cooling that cooling device is registered before it's ready (freq_table being populated). (Lukasz Luba) - fix a missing comment update (Caesar Wang) * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal: add the note for set_trip_temp thermal: cpu_cooling: fix improper order during initialization
Diffstat (limited to 'include/scsi')
0 files changed, 0 insertions, 0 deletions