Merge branch 'thinkpad-2.6.32' into release