Merge commit 'v3.6-rc1' into linux-next