Squashed update of kernel from 3.4.95 to 3.4.96