Merge pull request #1227 from shenki/kernel-4.12

Kernel 4.12