update driver for 3.18
Merge branch 'master' of https://github.com/oneru/linux