Squashed update of kernel from 3.4.98 to 3.4.99