Squashed update of kernel from 3.4.84 to 3.4.85