Merge tag 'v3.6-rc2' into next

Linux 3.6-rc2

Resync with Linus.