kernel: merge linux 3.0.58