Module Name: src Committed By: skrll Date: Thu Apr 3 06:10:59 UTC 2014
Update of /cvsroot/src/sys/external/bsd/dwc2/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12391 Log Message: Import dwc2 2014-04-03 Status: Vendor Tag: SYNOPSYS Release Tags: dwc2-2014-04-03 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 C 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 U 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