merge linux 3.0.80