| commit | 53daf9383f34d7bf61358a37449fb4d59fbdafc2 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Thu Jun 11 10:55:42 2015 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Thu Jun 11 10:55:42 2015 +0800 |
| tree | fc48ebe4fbf8e6c48cc07fcdab82a6010f7c61cf | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 [diff] | |
| parent | 9a5238a9c6c33dd31525f2bba4aa1af4f8374ae1 [diff] |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc