Squashed update of kernel from 3.0.95 to 3.0.96