diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-06-13 11:19:36 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-06-13 11:19:36 +0800 |
| commit | 30072fb91e1447b00fa148500c49010265b530c6 (patch) | |
| tree | 1dc52bb04d5f8ccf41a4d2b30d1a3f2d535d3179 /drivers/thermal/thermal_core.c | |
| parent | e7cd7886ef0478aaab23f445e2e8cd6e0e6bdd73 (diff) | |
| parent | 0c872507d84a6193cd769a808e65d34e1514b083 (diff) | |
| parent | ca0c711463565a8735b24f3b08310287adb6b4c9 (diff) | |
Merge branches 'for-rc' and 'ti-soc' of .git into next