Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux...
authorZhang Rui <rui.zhang@intel.com>
Mon, 15 Apr 2013 01:26:58 +0000 (09:26 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 15 Apr 2013 01:26:58 +0000 (09:26 +0800)
commitd13cb03aef0c062dcdd16b411bd4c02c1574ff08
tree0ee1d535ddf0ca49cd88484f042d12996f689e1c
parent2fd1db8819fbf73b5f74b4b4a205ab7be0957944
parentbbf7fc88c78f7317e2cdcf77e974c8a9a8312641
Merge branch 'thermal' of git://git./linux/kernel/git/rzhang/linux into next

Conflicts:
drivers/thermal/cpu_cooling.c
drivers/thermal/cpu_cooling.c
include/linux/thermal.h