diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-23 16:24:10 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-23 16:24:10 -0400 |
| commit | dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5 (patch) | |
| tree | 1926c96f145965c393a2c8ab523c327dd1a241cf /drivers/usb/host/octeon2-common.c | |
| parent | c8f2efc8f636506e0f0c2ba4035382076875f0c1 (diff) | |
| parent | 9d23108df359e572a0dca0b631bfee9f5e0fa9ea (diff) | |
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>
Diffstat (limited to 'drivers/usb/host/octeon2-common.c')
0 files changed, 0 insertions, 0 deletions