Merge branch 'thermal_core-doc-comments-update' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Sat, 27 Apr 2013 01:28:51 +0000 (09:28 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sat, 27 Apr 2013 01:28:51 +0000 (09:28 +0800)

Trivial merge