Squashed update of kernel from 3.0.84 to 3.0.85