]> 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: 9ceaa81 d805474)
Merge branch 'int340x-thermal' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 17 Oct 2014 06:30:58 +0000 (14:30 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 17 Oct 2014 06:30:58 +0000 (14:30 +0800)
1  2 
drivers/thermal/Kconfig patch | diff1 | diff2 | blob | history
drivers/thermal/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/thermal/Kconfig
Simple merge
diff --cc drivers/thermal/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.