Squashed update of kernel from 3.0.68 to 3.0.69