Merge branch 'thinkpad-2.6.33' into release