]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0b4588 4cba7d2 032f4a1)
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Mon, 14 Mar 2016 23:54:06 +0000 (07:54 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 14 Mar 2016 23:54:06 +0000 (07:54 +0800)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.