Merge branches 'for-rc' and 'thermal-core' into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 7 Dec 2018 08:49:50 +0000 (16:49 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 7 Dec 2018 08:49:50 +0000 (16:49 +0800)
commiteaaa598c0a285ef3b0efa54e711a385269fe50ce
tree6e33bb0f35d84eae9fc0cc8b88dae1570231eafe
parent68000a0d983f539c95ebe5dccd4f29535c7ac0af
parent72e9baf997286610a2a3109e79fdb528590c5523
Merge branches 'for-rc' and 'thermal-core' into next