Squashed update of kernel from 3.4.93 to 3.4.94