Linux 3.0.60

Conflicts:

	Makefile
	drivers/usb/serial/option.c