New merges with linux 3.0.66