tree 529271b31a849062491afce37527cb41dab65746
parent f6723b569a67aa4042b4ddc72822bf7f4395f3d2
parent cfbf8d4857c26a8a307fb7cd258074c9dcd8c691
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1393286362 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1393286362 -0800

Merge 3.14-rc4 into usb-next

We want the USB fixes in here as well.

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