Merge Linux 3.0.57-58