Linux 3.0.33

Conflicts:

	Makefile
	drivers/ata/ahci.c
	drivers/media/dvb/siano/smsusb.c
	drivers/usb/host/ehci-pci.c
	drivers/usb/host/pci-quirks.c
	drivers/usb/host/xhci.h
	drivers/usb/serial/ftdi_sio.c