diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 19:18:03 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 19:18:03 +0100 |
| commit | 99f14bd4d1b2a1b1b6cd508e08efdbc5e3919198 (patch) | |
| tree | a81b9b315127132a84454746043c98990bcd56b9 /drivers/usb/host/ohci-s3c2410.c | |
| parent | USB: core: remove CONFIG_USB_DEBUG usage (diff) | |
| parent | Linux 3.13-rc5 (diff) | |
| download | linux-99f14bd4d1b2a1b1b6cd508e08efdbc5e3919198.tar.xz linux-99f14bd4d1b2a1b1b6cd508e08efdbc5e3919198.zip | |
Merge 3.13-rc5 into usb-next
This resolves the merge issue with drivers/usb/host/ohci-at91.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ohci-s3c2410.c')
0 files changed, 0 insertions, 0 deletions