projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 192fef1 949db15)
Merge 3.8-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Jan 2013 20:41:02 +0000 (12:41 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 25 Jan 2013 20:41:02 +0000 (12:41 -0800)
commit67635d397a643514fdfa859f611b86bd3ad8958d
treeb5df6d79b35cde39c00f0cc1432f128f473d4d6etree | snapshot
parent192fef18d0f5ac9a05a93ff6314fc9865c10fbf9commit | diff
parent949db153b6466c6f7cad5a427ecea94985927311commit | diff
Merge 3.8-rc5 into usb-next

This fixes up a conflict with drivers/usb/serial/io_ti.c that came up in
linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS diff1 | diff2 | blob | history
drivers/usb/dwc3/gadget.c diff1 | diff2 | blob | history
drivers/usb/gadget/f_fs.c diff1 | diff2 | blob | history
drivers/usb/gadget/fsl_udc_core.c diff1 | diff2 | blob | history
drivers/usb/host/ehci-mxc.c diff1 | diff2 | blob | history
drivers/usb/host/uhci-hcd.c diff1 | diff2 | blob | history
drivers/usb/serial/option.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.