From: Len Brown <len.brown@intel.com>
Date: Thu, 13 Mar 2008 05:59:46 +0000 (-0400)
Subject: Merge branches 'release' and 'thermal' into release
X-Git-Tag: v2.6.25-rc6~19^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=160ff06b1848a01913611950b05963e3315f759b;p=linux.git

Merge branches 'release' and 'thermal' into release
---

160ff06b1848a01913611950b05963e3315f759b