Squashed update of kernel from 3.4.62 to 3.4.63

Conflicts:

	drivers/usb/host/xhci.h