Linux 3.0.67

Conflicts:

	drivers/usb/serial/option.c
Linux 3.0.68
Linux 3.0.69
4.1.2 Merge+