Merge tag 'v3.18-rc4' into for_next

Linux 3.18-rc4