]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1483c51b1958a9cdc7bd1d2282c55a789788284a
treea81b9b315127132a84454746043c98990bcd56b9
parent217a3f63cb82edc879d96513f638d561375476fa
parent06c006f3502c19a73926310440804e736635906d
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
drivers/usb/class/cdc-wdm.c
drivers/usb/host/ohci-at91.c
drivers/usb/host/xhci-pci.c
drivers/usb/serial/option.c