Squashed update of kernel from 3.4.60 to 3.4.61