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)
commit6b791e936c15ccace22dc2e4cb6d7d7196423ba7
tree2c4426784944f8ccf811714bb9aeb8fb9474b10f
parent22d9aac23562ea0e921db152f11cf39e3c2b9945
parent924e61a90f61b1c22fcb51aaf3afc065399cec81
Merge branch 'thermal-fix' into release-2.6.27