Module Name: src
Committed By: skrll
Date: Sun Nov 24 12:25:19 UTC 2013
Modified Files:
src/sys/external/bsd/dwc2/dist: dwc2_hcd.c dwc2_hcdintr.c
dwc2_hcdqueue.c
Log Message:
Resolve conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/dwc2/dist/dwc2_hcd.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c \
src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
