Merge branch 'master' into usb-next

We have USB fixes now in Linus's tree that we need to properly sort out
with reverts and the like in the usb-next branch, so merge them together
and do it by hand.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/usb/host/ehci-fsl.c
Simple merge