]> 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)
commit767eb94daab5aa8d1c23b6c7d2a1e4d06c5cf1e0
treea81b9b315127132a84454746043c98990bcd56b9
parentecd85d464a20239d72255ceb56bc831a4e75dfd6
parent555049357e37e5935879c793a2bc786f3e57b4d4
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