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)
We need these USB fixes in here as well.

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

Simple merge
Simple merge
Simple merge