Support for kernel >= 3.15
Almost done with #38.
Fixes #38
Fixed conflict
really fixed conflicts...
Merge branch 'linux-3.15.0'