Linux 3.0.100

Conflicts:
	drivers/usb/serial/option.c