Linux 3.4.12

Conflicts:
	drivers/usb/host/xhci.h