Fixes

Conflicts:

	arch/arm/boot/zImage-dtb
	drivers/usb/host/xhci-hub.c
	drivers/usb/host/xhci.c