summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2018-12-07 16:49:50 +0800
committerZhang Rui <rui.zhang@intel.com>2018-12-07 16:49:50 +0800
commiteaaa598c0a285ef3b0efa54e711a385269fe50ce (patch)
tree6e33bb0f35d84eae9fc0cc8b88dae1570231eafe /block
parent68000a0d983f539c95ebe5dccd4f29535c7ac0af (diff)
parent72e9baf997286610a2a3109e79fdb528590c5523 (diff)
downloadlinux-eaaa598c0a285ef3b0efa54e711a385269fe50ce.tar.bz2
Merge branches 'for-rc' and 'thermal-core' into next
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions