Module Name:	src
Committed By:	chap
Date:		Sat May 20 04:32:00 UTC 2006

Modified Files:
	src/sys/dev [chap-midi]: midi.c midi_if.h midisyn.c midisynvar.h
	    midivar.h sequencer.c sequencervar.h
	src/sys/dev/usb [chap-midi]: umidi.c umidi_quirks.c usbdevs
	src/sys/sys [chap-midi]: midiio.h

Log Message:
Now for Phase Two. The patched files have been rolled forward again, with
a naive mechanical resolution of conflicts. Now to compare the diffs and
make sure the resolutions made sense. Sleep first.


To generate a diff of this commit:
cvs rdiff -r1.43.2.15 -r1.43.2.16 src/sys/dev/midi.c
cvs rdiff -r1.17.14.9 -r1.17.14.10 src/sys/dev/midi_if.h
cvs rdiff -r1.17.2.9 -r1.17.2.10 src/sys/dev/midisyn.c
cvs rdiff -r1.9.14.9 -r1.9.14.10 src/sys/dev/midisynvar.h
cvs rdiff -r1.11.14.15 -r1.11.14.16 src/sys/dev/midivar.h
cvs rdiff -r1.30.14.15 -r1.30.14.16 src/sys/dev/sequencer.c
cvs rdiff -r1.10.14.7 -r1.10.14.8 src/sys/dev/sequencervar.h
cvs rdiff -r1.25.2.12 -r1.25.2.13 src/sys/dev/usb/umidi.c
cvs rdiff -r1.10.2.8 -r1.10.2.9 src/sys/dev/usb/umidi_quirks.c
cvs rdiff -r1.428.2.4 -r1.428.2.5 src/sys/dev/usb/usbdevs
cvs rdiff -r1.13.14.1 -r1.13.14.2 src/sys/sys/midiio.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.