From owner-cvs-sys Mon Nov 10 10:15:01 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id KAA16698 for cvs-sys-outgoing; Mon, 10 Nov 1997 10:15:01 -0800 (PST) (envelope-from owner-cvs-sys) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id KAA16574; Mon, 10 Nov 1997 10:12:43 -0800 (PST) (envelope-from markm@FreeBSD.org) From: Mark Murray Received: (from markm@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id KAA16245; Mon, 10 Nov 1997 10:10:42 -0800 (PST) Date: Mon, 10 Nov 1997 10:10:42 -0800 (PST) Message-Id: <199711101810.KAA16245@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG Subject: cvs commit: src/sys - Imported sources Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk markm 1997/11/10 10:10:42 PST src/sys - Imported sources Update of /home/ncvs/src/sys In directory freefall.freebsd.org:/d/markm/import/sys Log Message: Import of guspnp23. Status: Vendor Tag: AMANCIO Release Tags: guspnp_23 C src/sys/i386/isa/sound/CHANGELOG C src/sys/i386/isa/sound/ulaw.h C src/sys/i386/isa/sound/uart6850.c U src/sys/i386/isa/sound/tuning.h C src/sys/i386/isa/sound/trix_boot.h C src/sys/i386/isa/sound/trix.c C src/sys/i386/isa/sound/sys_timer.c C src/sys/i386/isa/sound/sscape.c C src/sys/i386/isa/sound/soundvers.h C src/sys/i386/isa/sound/soundcard.c C src/sys/i386/isa/sound/sequencer.c C src/sys/i386/isa/sound/sound_timer.c C src/sys/i386/isa/sound/sound_switch.c C src/sys/i386/isa/sound/sound_pnp.c C src/sys/i386/isa/sound/sound_config.h C src/sys/i386/isa/sound/sound_calls.h C src/sys/i386/isa/sound/ad1848.c C src/sys/i386/isa/sound/sbcard.h C src/sys/i386/isa/sound/sb_mixer.h C src/sys/i386/isa/sound/sb_mixer.c C src/sys/i386/isa/sound/sb_midi.c C src/sys/i386/isa/sound/sb_dsp.c C src/sys/i386/isa/sound/sb_card.c C src/sys/i386/isa/sound/sb16_midi.c C src/sys/i386/isa/sound/sb16_dsp.c U src/sys/i386/isa/sound/pss.h C src/sys/i386/isa/sound/pss.c C src/sys/i386/isa/sound/patmgr.c C src/sys/i386/isa/sound/pas_hw.h C src/sys/i386/isa/sound/pas2_pcm.c C src/sys/i386/isa/sound/pas2_mixer.c C src/sys/i386/isa/sound/pas2_midi.c C src/sys/i386/isa/sound/pas2_card.c C src/sys/i386/isa/sound/os.h C src/sys/i386/isa/sound/opl3.h C src/sys/i386/isa/sound/opl3.c C src/sys/i386/isa/sound/mpu401.c C src/sys/i386/isa/sound/mmap_test.c C src/sys/i386/isa/sound/midibuf.c C src/sys/i386/isa/sound/midi_synth.h C src/sys/i386/isa/sound/midi_synth.c C src/sys/i386/isa/sound/midi_ctrl.h C src/sys/i386/isa/sound/maui.c C src/sys/i386/isa/sound/mad16_sb_midi.c C src/sys/i386/isa/sound/mad16.c C src/sys/i386/isa/sound/local.h C src/sys/i386/isa/sound/iwdefs.h C src/sys/i386/isa/sound/ics2101.c C src/sys/i386/isa/sound/hex2hex.h C src/sys/i386/isa/sound/gus_wave.c C src/sys/i386/isa/sound/gus_vol.c C src/sys/i386/isa/sound/gus_midi.c U src/sys/i386/isa/sound/gus_linearvol.h U src/sys/i386/isa/sound/gus_hw.h C src/sys/i386/isa/sound/gus_card.c U src/sys/i386/isa/sound/finetune.h C src/sys/i386/isa/sound/dmabuf.c C src/sys/i386/isa/sound/dev_table.h C src/sys/i386/isa/sound/dev_table.c C src/sys/i386/isa/sound/cs4232.c C src/sys/i386/isa/sound/coproc.h C src/sys/i386/isa/sound/awe_wave.c C src/sys/i386/isa/sound/awe_voice.h C src/sys/i386/isa/sound/awe_hw.h C src/sys/i386/isa/sound/audio.c C src/sys/i386/isa/sound/Readme C src/sys/i386/isa/sound/aedsp16.c C src/sys/i386/isa/sound/adlib_card.c C src/sys/i386/isa/sound/ad1848_mixer.h I src/sys/i386/isa/sound/ad1848.c~ C src/sys/i386/isa/sound/Readme.v30 C src/sys/i386/isa/sound/Readme.modules C src/sys/i386/isa/sound/Readme.cards C src/sys/i386/isa/sound/Readme.aedsp16 U src/sys/i386/isa/sound/COPYING C src/sys/i386/isa/sound/README.FREEBSD C src/sys/i386/isa/sound/ultrasound.h C src/sys/i386/isa/sound/README C src/sys/i386/isa/sound/alaw.h C src/sys/i386/isa/sound/mad16.h C src/sys/i386/isa/sound/pas_defs.h C src/sys/i386/isa/sound/pcm86.c C src/sys/i386/isa/sound/sb_defs.h C src/sys/i386/isa/sound/sound.doc 77 conflicts created by this import. Use the following command to help the merge: cvs checkout -jAMANCIO:yesterday -jAMANCIO src/sys