Merge branches 'for-rc' and 'ti-soc' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Thu, 13 Jun 2013 03:19:36 +0000 (11:19 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 13 Jun 2013 03:19:36 +0000 (11:19 +0800)
1  2  3 
drivers/thermal/thermal_core.c

Simple merge