Module Name: src Committed By: skrll Date: Sun Aug 30 12:46:50 UTC 2015
Update of /cvsroot/src/sys/external/bsd/dwc2/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3133 Log Message: Import dwc2 2015-08-30 Status: Vendor Tag: SYNOPSYS Release Tags: dwc2-2015-08-30 C src/sys/external/bsd/dwc2/dist/dwc2_core.c C src/sys/external/bsd/dwc2/dist/dwc2_core.h C src/sys/external/bsd/dwc2/dist/dwc2_coreintr.c C src/sys/external/bsd/dwc2/dist/dwc2_hcd.c C src/sys/external/bsd/dwc2/dist/dwc2_hcd.h U src/sys/external/bsd/dwc2/dist/dwc2_hcdddma.c C src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c C src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c C src/sys/external/bsd/dwc2/dist/dwc2_hw.h 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jSYNOPSYS:yesterday -jSYNOPSYS src/sys/external/bsd/dwc2/dist