Merge commit 'v2.6.32-rc5' into for-2.6.33