Apply vanilla patches for 3.12 kernel
Merge branch 'master' into vanilla-ravion