squashed update of kernel to 3.0.96