Squashed update of kernel from 3.4.68 to 3.4.69