Merge branch 'thinkpad-2.6.32-part2' into release