Merge branches 'for-rc' and 'ti-soc' of .git into next

author Zhang Rui <rui.zhang@intel.com>

Thu, 13 Jun 2013 03:19:36 +0000 (11:19 +0800)

committer Zhang Rui <rui.zhang@intel.com>

Thu, 13 Jun 2013 03:19:36 +0000 (11:19 +0800)
author Zhang Rui <rui.zhang@intel.com>
Thu, 13 Jun 2013 03:19:36 +0000 (11:19 +0800)
committer Zhang Rui <rui.zhang@intel.com>
Thu, 13 Jun 2013 03:19:36 +0000 (11:19 +0800)
diff --cc drivers/thermal/thermal_core.c
Simple merge
author	Zhang Rui <rui.zhang@intel.com>
	Thu, 13 Jun 2013 03:19:36 +0000 (11:19 +0800)
committer	Zhang Rui <rui.zhang@intel.com>
	Thu, 13 Jun 2013 03:19:36 +0000 (11:19 +0800)