99f14bd4d1
This resolves the merge issue with drivers/usb/host/ohci-at91.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
cdc-acm.c | ||
cdc-acm.h | ||
cdc-wdm.c | ||
usblp.c | ||
usbtmc.c |