Squashed update of kernel from 3.4.83 to 3.4.84