Squashed update of kernel from 3.4.96 to 3.4.97