Linux 3.0.45

Conflicts:

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