diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-04-15 03:26:58 +0200 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-15 03:26:58 +0200 |
| commit | d13cb03aef0c062dcdd16b411bd4c02c1574ff08 (patch) | |
| tree | 0ee1d535ddf0ca49cd88484f042d12996f689e1c /block/compat_ioctl.c | |
| parent | thermal: dove: Fix thermal sensor formula (diff) | |
| parent | Thermal: build cpu_cooling code into thermal_sys module (diff) | |
| download | linux-d13cb03aef0c062dcdd16b411bd4c02c1574ff08.tar.xz linux-d13cb03aef0c062dcdd16b411bd4c02c1574ff08.zip | |
Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into next
Conflicts:
drivers/thermal/cpu_cooling.c
Diffstat (limited to 'block/compat_ioctl.c')
0 files changed, 0 insertions, 0 deletions