tree 2289e5d1ec20df5e465b9b629e291877f4d70485
parent 1c83d94ff646001f9ee83f0330a3933b55660927
parent 317ddd256b9c24b0d78fa8018f80f1e495481a10
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1370752071 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1370752071 -0700

Merge 3.10-rc5 into usb-next

We need the changes in this branch.

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