Merge tag 'v3.11-rc7' into devicetree/next

Linux 3.11-rc7