Merge branch 'thinkpad-2.6.32-part2' into release
Len Brown [Sat, 26 Sep 2009 05:08:55 +0000 (01:08 -0400)]

Trivial merge