Merge tag 'v3.18.10' into backport/v3.18.10/snapshot.wip

Linux 3.18.10

Conflicts:
	drivers/usb/host/xhci-plat.c