ENH: Fixes for > 2.6.39 kernels