fix compilation on kernel 3.10
Merge branch 'kernelV3.10'