]> err.no Git - linux-2.6/commitdiff
Merge branch 'thermal-fix' into release-2.6.27
authorAndi Kleen <ak@linux.intel.com>
Sat, 16 Aug 2008 01:25:04 +0000 (03:25 +0200)
committerAndi Kleen <ak@linux.intel.com>
Sat, 16 Aug 2008 01:25:04 +0000 (03:25 +0200)

Trivial merge