CVS commit: src/libexec/tftpd
Module Name:src Committed By: jnemeth Date: Fri Oct 4 07:51:48 UTC 2013 Modified Files: src/libexec/tftpd: tftpd.c Log Message: - complete renaming of -w to -c from 1.38 - update usage string to match - this fixes PR/48234 by Jeff Woodall To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/libexec/tftpd/tftpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/udf
Module Name:src Committed By: hannken Date: Fri Oct 4 08:35:08 UTC 2013 Modified Files: src/sys/fs/udf: udf_vnops.c Log Message: Remove a bogus vrecycle() from udf_inactive(). Vrecycle() works on inactive vnodes while VOP_INACTIVE() should never be called on an inactive vnode. Ok: Reinoud Zandijk To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/fs/udf/udf_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Fri Oct 4 12:47:04 UTC 2013 Modified Files: src/sys/dev/usb: usbdi.c Log Message: Small KNF To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/sys/dev/usb/usbdi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib/libgdb
Module Name:src Committed By: christos Date: Fri Oct 4 13:04:00 UTC 2013 Modified Files: src/external/gpl3/gdb/lib/libgdb: Makefile Log Message: new need to run yacc/lex now, since the generated files have been removed and account for the ada dependencies. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/lib/libgdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet6
Module Name:src Committed By: christos Date: Fri Oct 4 14:23:14 UTC 2013 Modified Files: src/sys/netinet6: ip6_input.c Log Message: check result of setscope, from logan. To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/sys/netinet6/ip6_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/emips/stand
Module Name:src Committed By: christos Date: Fri Oct 4 15:01:52 UTC 2013 Modified Files: src/sys/arch/emips/stand: Makefile.booters Log Message: remove -g To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/stand/Makefile.booters Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/emips/stand/bootxx_cd9660
Module Name:src Committed By: christos Date: Fri Oct 4 15:02:15 UTC 2013 Modified Files: src/sys/arch/emips/stand/bootxx_cd9660: Makefile Log Message: kill useless expr To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/emips/stand/bootxx_cd9660/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: christos Date: Fri Oct 4 15:02:43 UTC 2013 Modified Files: src/sys/arch/mips/conf: stand.ldscript Log Message: discard eh sections To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/conf/stand.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amiga/conf
Module Name:src Committed By: rkujawa Date: Fri Oct 4 15:13:51 UTC 2013 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL MDINSTALL Log Message: Nuke long dead NKPTADD and NKPTADDSHIFT options from config files. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.304 -r1.305 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.119 -r1.120 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.122 -r1.123 src/sys/arch/amiga/conf/INSTALL cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amiga/conf/MDINSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: rmind Date: Fri Oct 4 15:14:11 UTC 2013 Modified Files: src/sys/fs/tmpfs: tmpfs_subr.c tmpfs_vnops.c Log Message: - tmpfs_remove: check 'appendable' flag for the parent directory as well. Patch from Pedro Martelletto. - tmpfs_dir_detach: remove missleading check. - tmpfs_link: remove unused variable. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/fs/tmpfs/tmpfs_subr.c cvs rdiff -u -r1.102 -r1.103 src/sys/fs/tmpfs/tmpfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: rkujawa Date: Fri Oct 4 15:15:39 UTC 2013 Modified Files: src/share/man/man4: options.4 Log Message: Remove long dead options NKPTADD, NKPTADDSHIT. To generate a diff of this commit: cvs rdiff -u -r1.427 -r1.428 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Fri Oct 4 15:24:44 UTC 2013 Modified Files: src/external/gpl3/gdb/dist/gdb: i386bsd-nat.h i386nbsd-tdep.c Log Message: fix i386 build. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/i386bsd-nat.h cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/i386nbsd-tdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: christos Date: Fri Oct 4 16:20:35 UTC 2013 Modified Files: src/sys/netinet: tcp_usrreq.c Log Message: PR/48098: Brian Marcotte: Avoid kernel assertion for embryonic sockets that don't have credentials yet. XXX: pullup-6 To generate a diff of this commit: cvs rdiff -u -r1.167 -r1.168 src/sys/netinet/tcp_usrreq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Fri Oct 4 16:50:18 UTC 2013 Modified Files: src/share/man/man4: options.4 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.428 -r1.429 src/share/man/man4/options.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: msaitoh Date: Fri Oct 4 17:12:48 UTC 2013 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: Fix typo in comment (s/XRC0/XCR0/). To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Fri Oct 4 17:21:43 UTC 2013 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add comment about CPUID Processor extended state Enumeration Fn000d %eax. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Fri Oct 4 17:53:19 UTC 2013 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Sort definitions. No functional change. - CPUID_FEAT_BLACKLIST is for Fn0001 %edx, so move it. - Sort CPUID definitions with initial EAX value. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src Committed By: christos Date: Fri Oct 4 18:08:02 UTC 2013 Modified Files: src/external/gpl3/binutils/dist/bfd: aoutx.h Log Message: Allow bfd_mach_arm4 machines to produce a.out binaries. Perhaps we should just let every arm machine produce them? Or we should use M_ARM6_NETBSD midmag for those? To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/bfd/aoutx.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Fri Oct 4 20:49:16 UTC 2013 Modified Files: src/lib/libc/compat/gen: compat___fts13.c compat___fts30.c compat___fts31.c compat___fts32.c compat_fts.c compat_getmntinfo.c compat_glob.c compat_time.c compat_times.c src/lib/libc/compat/sys: compat___fhstat30.c compat___stat13.c compat___stat30.c compat_getrusage.c compat_gettimeofday.c compat_mknod.c compat_stat.c compat_statfs.c src/lib/libc/ssp: gets_chk.c src/lib/libc/stdio: gets.c local.h src/sys/compat/sys: mount.h resource.h stat.h time.h Log Message: avoid linker warning for compat symbols that are used internally in libc, by introducing a hidden compat_foo() function, using that internally in libc, and exposing foo as a strong alias to compat_foo(). I am open for better ideas. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/compat/gen/compat___fts13.c cvs rdiff -u -r1.6 -r1.7 src/lib/libc/compat/gen/compat___fts30.c \ src/lib/libc/compat/gen/compat_fts.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/gen/compat___fts31.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/gen/compat___fts32.c cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/gen/compat_getmntinfo.c \ src/lib/libc/compat/gen/compat_glob.c \ src/lib/libc/compat/gen/compat_time.c \ src/lib/libc/compat/gen/compat_times.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/sys/compat___fhstat30.c \ src/lib/libc/compat/sys/compat___stat13.c cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/sys/compat___stat30.c \ src/lib/libc/compat/sys/compat_getrusage.c \ src/lib/libc/compat/sys/compat_gettimeofday.c \ src/lib/libc/compat/sys/compat_mknod.c \ src/lib/libc/compat/sys/compat_stat.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/compat/sys/compat_statfs.c cvs rdiff -u -r1.6 -r1.7 src/lib/libc/ssp/gets_chk.c cvs rdiff -u -r1.17 -r1.18 src/lib/libc/stdio/gets.c cvs rdiff -u -r1.36 -r1.37 src/lib/libc/stdio/local.h cvs rdiff -u -r1.8 -r1.9 src/sys/compat/sys/mount.h cvs rdiff -u -r1.3 -r1.4 src/sys/compat/sys/resource.h \ src/sys/compat/sys/time.h cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/stat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: christos Date: Fri Oct 4 21:07:37 UTC 2013 Modified Files: src/lib/libc/compat/gen: compat___fts13.c compat___fts30.c compat___fts31.c compat___fts32.c compat_fts.c compat_getmntinfo.c compat_glob.c compat_time.c compat_times.c src/lib/libc/compat/sys: compat___fhstat30.c compat___stat13.c compat___stat30.c compat_getrusage.c compat_gettimeofday.c compat_mknod.c compat_stat.c compat_statfs.c src/sys/compat/sys: mount.h resource.h stat.h time.h Log Message: prefix compat with __ in case __dso_hidden is not available To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/compat/gen/compat___fts13.c cvs rdiff -u -r1.7 -r1.8 src/lib/libc/compat/gen/compat___fts30.c \ src/lib/libc/compat/gen/compat_fts.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/compat/gen/compat___fts31.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/gen/compat___fts32.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/gen/compat_getmntinfo.c \ src/lib/libc/compat/gen/compat_glob.c \ src/lib/libc/compat/gen/compat_time.c \ src/lib/libc/compat/gen/compat_times.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/compat/sys/compat___fhstat30.c \ src/lib/libc/compat/sys/compat___stat13.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/compat/sys/compat___stat30.c \ src/lib/libc/compat/sys/compat_getrusage.c \ src/lib/libc/compat/sys/compat_gettimeofday.c \ src/lib/libc/compat/sys/compat_mknod.c \ src/lib/libc/compat/sys/compat_stat.c cvs rdiff -u -r1.6 -r1.7 src/lib/libc/compat/sys/compat_statfs.c cvs rdiff -u -r1.9 -r1.10 src/sys/compat/sys/mount.h cvs rdiff -u -r1.4 -r1.5 src/sys/compat/sys/resource.h \ src/sys/compat/sys/time.h cvs rdiff -u -r1.5 -r1.6 src/sys/compat/sys/stat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: joerg Date: Fri Oct 4 21:10:18 UTC 2013 Modified Files: src/sys/dev/ic: sl811hs.c Log Message: Move an assert to the point where the referenced variable is initialized. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/dev/ic/sl811hs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib
Module Name:src Committed By: mrg Date: Fri Oct 4 22:31:12 UTC 2013 Added Files: src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib: config.h Log Message: regenerate for gdb 7.6. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgdb/arch/mips64el/build-gnulib/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Fri Oct 4 23:40:17 UTC 2013 Modified Files: src/external/gpl3/gdb/dist/gdb: alphanbsd-tdep.c Log Message: merge alpha changes To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/alphanbsd-tdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: christos Date: Fri Oct 4 23:42:00 UTC 2013 Modified Files: src/external/gpl3/gdb/lib/libbfd/arch/alpha: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h targmatch.h src/external/gpl3/gdb/lib/libdecnumber/arch/alpha: config.h gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/alpha: config.h defs.mk init.c observer.h observer.inc version.c xml-builtin.c src/external/gpl3/gdb/lib/libiberty/arch/alpha: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/alpha: config.h src/external/gpl3/gdb/lib/libreadline/arch/alpha: config.h defs.mk Added Files: src/external/gpl3/gdb/lib/libgdb/arch/alpha: jit-reader.h src/external/gpl3/gdb/lib/libgdb/arch/alpha/build-gnulib: config.h Log Message: fix alpha To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gdb/lib/libbfd/arch/alpha/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/alpha/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/alpha/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/alpha/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gdb/lib/libbfd/arch/alpha/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/alpha/targmatch.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gdb/lib/libdecnumber/arch/alpha/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gdb/lib/libdecnumber/arch/alpha/gstdint.h cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/lib/libgdb/arch/alpha/config.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/lib/libgdb/arch/alpha/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/alpha/init.c cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgdb/arch/alpha/jit-reader.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gdb/lib/libgdb/arch/alpha/observer.h \ src/external/gpl3/gdb/lib/libgdb/arch/alpha/observer.inc \ src/external/gpl3/gdb/lib/libgdb/arch/alpha/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/alpha/xml-builtin.c cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgdb/arch/alpha/build-gnulib/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gdb/lib/libiberty/arch/alpha/config.h \ src/external/gpl3/gdb/lib/libiberty/arch/alpha/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gdb/lib/libopcodes/arch/alpha/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gdb/lib/libreadline/arch/alpha/config.h \ src/external/gpl3/gdb/lib/libreadline/arch/alpha/defs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 02:39:06 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: SHEEVAPLUG Log Message: Remove options LKM. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/SHEEVAPLUG Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 02:43:16 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: files.marvell Log Message: Add defparam MVSOC_FIXUP_DEVID to opt_mvsoc.h. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/files.marvell Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 02:47:44 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 Log Message: Add options COM_16750. It is requiring now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 03:59:49 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: MARVELL_NAS Log Message: Change some comments and coment-outed options. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/MARVELL_NAS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 06:10:35 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: OPENBLOCKS_A6 OPENBLOCKS_AX3 Log Message: Cleanup. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/OPENBLOCKS_A6 cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 06:14:48 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: OPENBLOCKS_A6 Log Message: Add comment-outed mvgbec1 and mvgbe for A7. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/OPENBLOCKS_A6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: kiyohara Date: Sat Oct 5 06:15:51 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: OPENBLOCKS_AX3 Log Message: Disable mvgbec and mvgbe. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/sys/external/bsd/dwc2/dist
Module Name:src Committed By: skrll Date: Sat Oct 5 06:47:09 UTC 2013 Update of /cvsroot/src/sys/external/bsd/dwc2/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9423 Log Message: Import dwc2 2013-10-05 Status: Vendor Tag: SYNOPSYS Release Tags: dwc2-2013-10-05 C src/sys/external/bsd/dwc2/dist/dwc2_core.c C src/sys/external/bsd/dwc2/dist/dwc2_core.h U 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 7 conflicts created by this import. Use the following command to help the merge: cvs checkout -jSYNOPSYS:yesterday -jSYNOPSYS src/sys/external/bsd/dwc2/dist
CVS commit: src/sys/external/bsd/dwc2/dist
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.
