| commit | d13cb03aef0c062dcdd16b411bd4c02c1574ff08 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Mon Apr 15 09:26:58 2013 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Mon Apr 15 09:26:58 2013 +0800 |
| tree | 0ee1d535ddf0ca49cd88484f042d12996f689e1c | |
| parent | 2fd1db8819fbf73b5f74b4b4a205ab7be0957944 [diff] | |
| parent | bbf7fc88c78f7317e2cdcf77e974c8a9a8312641 [diff] |
Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into next Conflicts: drivers/thermal/cpu_cooling.c