author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
Sat, 17 Nov 2012 02:46:21 +0000 (18:46 -0800) | ||
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
Sat, 17 Nov 2012 02:46:21 +0000 (18:46 -0800) |
This resolves a conflict with these files:
drivers/usb/early/ehci-dbgp.c
drivers/usb/host/ehci-ls1x.c
drivers/usb/host/ohci-xls.c
drivers/usb/musb/ux500.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/early/ehci-dbgp.c
drivers/usb/host/ehci-ls1x.c
drivers/usb/host/ohci-xls.c
drivers/usb/musb/ux500.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 | 2 | |||
---|---|---|---|---|
drivers/usb/core/hcd.c | patch | | diff1 | | diff2 | | blob | history |
drivers/usb/musb/musb_gadget.c | patch | | diff1 | | diff2 | | blob | history |
drivers/usb/serial/keyspan.c | patch | | diff1 | | diff2 | | blob | history |
drivers/usb/serial/option.c | patch | | diff1 | | diff2 | | blob | history |
drivers/usb/serial/usb_wwan.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc drivers/usb/core/hcd.c
Simple merge
diff --cc drivers/usb/musb/musb_gadget.c
Simple merge
diff --cc drivers/usb/serial/keyspan.c
Simple merge
diff --cc drivers/usb/serial/option.c
Simple merge
diff --cc drivers/usb/serial/usb_wwan.c
Simple merge