From: Zhang Rui <rui.zhang@intel.com>
Date: Wed, 24 Apr 2013 16:57:37 +0000 (+0800)
Subject: Merge branch 'cpu_cooling-doc-comments-update' of .git into next
X-Git-Tag: v3.10-rc1~42^2~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=07273d25b87b266be1b0c41e245025c9107d6699;p=linux.git

Merge branch 'cpu_cooling-doc-comments-update' of .git into next
---

07273d25b87b266be1b0c41e245025c9107d6699