compatibility to linux-3.17
Merge branch 'lukas2511-linux-3.17'