unified 3.4.61

Signed-off-by: klozz <xxx.reptar.rawrr.xxx@gmail.com>
Linux 3.4.62
Linux 3.4.63

Conflicts:
	drivers/usb/host/xhci.h