Linux upstream 3.4.y