| commit | 9c1e4550b5cbe17ff68ce631356190ef9a565386 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Tue Dec 09 11:37:35 2014 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Tue Dec 09 11:37:35 2014 +0800 |
| tree | 04cd872bd8afd2b2fe143e2c17a180a39d1a275c | |
| parent | 009d0431c3914de64666bec0d350e54fdd59df6a [diff] | |
| parent | 184a4bf623fa587067851d25435fcb2f41de445b [diff] |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into eduardo-soc-thermal