Linux 3.0.49

Conflicts:

	Makefile
	drivers/usb/host/xhci-ring.c
	drivers/usb/serial/option.c