Merge 3.15-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 May 2014 00:49:41 +0000 (09:49 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 May 2014 00:49:41 +0000 (09:49 +0900)
commitcea35899a02226b70baeee7e179d7a7c6e814b98
tree19621a7ae67df5f398071791d52489a464b1b30a
parent53971a86d2db89f32859dc26bd6594b5bc665d5b
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c
Merge 3.15-rc5 into usb-next

We need these USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ohci-hub.c
drivers/usb/host/ohci.h
drivers/usb/phy/phy-fsm-usb.c