Merge commit 'v2.6.31-rc1' into dmaengine