Merge tag 'v3.12-rc4' into devel

Linux 3.12-rc4