Merge tag 'v3.7-rc7' into asoc-ux500

Linux 3.7-rc7