3.0.42

Conflicts:

	Makefile
	drivers/infiniband/ulp/srp/ib_srp.c
	drivers/usb/host/xhci-pci.c
	drivers/usb/host/xhci.c
	drivers/usb/host/xhci.h
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/option.c