Squashed update of kernel from 3.0.83 to 3.0.84