Merge branches 'misc' and 'soc' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 3 Jan 2014 14:55:04 +0000 (22:55 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 3 Jan 2014 14:55:04 +0000 (22:55 +0800)
1  2  3 
drivers/thermal/thermal_core.c

Simple merge