Module Name: src
Committed By: skrll
Date: Sat Oct 5 06:51:43 UTC 2013
Modified Files:
src/sys/external/bsd/dwc2/dist: dwc2_core.c dwc2_core.h dwc2_coreintr.c
dwc2_hcd.c dwc2_hcd.h dwc2_hcdddma.c dwc2_hcdintr.c dwc2_hcdqueue.c
Log Message:
Merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/dwc2/dist/dwc2_core.c \
src/sys/external/bsd/dwc2/dist/dwc2_core.h \
src/sys/external/bsd/dwc2/dist/dwc2_hcdddma.c \
src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/dwc2/dist/dwc2_coreintr.c \
src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/dwc2/dist/dwc2_hcd.c \
src/sys/external/bsd/dwc2/dist/dwc2_hcd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
