Merge branch 'cpu_cooling-doc-comments-update' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Wed, 24 Apr 2013 16:57:37 +0000 (00:57 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 24 Apr 2013 16:57:37 +0000 (00:57 +0800)

Trivial merge