]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7368e6a 4bcef79)
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)
commit78e98ca3f8b66c2b875fb0e226d637cc44019587
treeb5df6d79b35cde39c00f0cc1432f128f473d4d6etree | snapshot
parent7368e6ab86300de7437b1ba73c9d47a113346f22commit | diff
parent4bcef794c53660c544eaf850f64ba85d4a61e2a9commit | 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
Linux Kernel Source Tree.