Merge tag 'v3.12'

Linux 3.12