Merged with some linux 3.0.64 code