Rebuild against kernel 3.11.2
Merge branch 'master' into next