Merge branch 'misc-2.6.33' into release