linux-next 3.10.1, small config changes