diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-04-15 09:26:58 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-04-15 09:26:58 +0800 |
| commit | d13cb03aef0c062dcdd16b411bd4c02c1574ff08 (patch) | |
| tree | 0ee1d535ddf0ca49cd88484f042d12996f689e1c /virt/kvm | |
| parent | 2fd1db8819fbf73b5f74b4b4a205ab7be0957944 (diff) | |
| parent | bbf7fc88c78f7317e2cdcf77e974c8a9a8312641 (diff) | |
| download | op-kernel-dev-d13cb03aef0c062dcdd16b411bd4c02c1574ff08.zip op-kernel-dev-d13cb03aef0c062dcdd16b411bd4c02c1574ff08.tar.gz | |
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 'virt/kvm')
0 files changed, 0 insertions, 0 deletions
