diff options
| author | Zhang Rui | 2016-01-23 11:43:27 +0800 |
|---|---|---|
| committer | Zhang Rui | 2016-01-23 11:43:27 +0800 |
| commit | 98d94507e10c3c0a5cfc1c3ac4df23e761f1b874 (patch) | |
| tree | fcdfd143e4b623f77835e8814eb014f47d4fe79e | |
| parent | 20bbfaf72cb419cf2a864978df3fc36f1986046a (diff) | |
| parent | 4511f7166a2deb5f7a578cf87fd2fe1ae83527e3 (diff) | |
| parent | ad74e46cb3ba9e706f91f3f71baf816d2d8e45db (diff) | |
Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next