Merge branch 'for-2.6.32' into mxc