git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3482528 413541d)
Merge 3.13-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2013 18:18:03 +0000 (10:18 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2013 18:18:03 +0000 (10:18 -0800)
commit99f14bd4d1b2a1b1b6cd508e08efdbc5e3919198
treea81b9b315127132a84454746043c98990bcd56b9tree
parent3482528e9aced9234d4e2a4a9538c882a9aa5aa2commit | diff
parent413541dd66d51f791a0b169d9b9014e4f56be13ccommit | diff
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>
drivers/usb/chipidea/core.c diff1 | diff2 | blob | history
drivers/usb/class/cdc-wdm.c diff1 | diff2 | blob | history
drivers/usb/host/ohci-at91.c diff1 | diff2 | blob | history
drivers/usb/host/xhci-pci.c diff1 | diff2 | blob | history
drivers/usb/serial/option.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.