Merge branch 'misc-2.6.31' into release