Squashed update of kernel from 3.0.96 to 3.0.97