Linux 3.0.57

Conflicts:

	Makefile
	drivers/usb/serial/option.c