Module Name:	src
Committed By:	chap
Date:		Sun May 21 17:28:48 UTC 2006

Modified Files:
	src/share/man/man4 [chap-midi]: umidi.4
	src/sys/dev [chap-midi]: midi.c midivar.h
	src/sys/dev/usb [chap-midi]: umidi.c
	src/sys/sys [chap-midi]: midiio.h

Log Message:
@.n.o e-mail address, and a couple of corrections to the mechanical
merge, found by eyeball. Now to see how many gcc will catch....


To generate a diff of this commit:
cvs rdiff -r1.6.12.1 -r1.6.12.2 src/share/man/man4/umidi.4
cvs rdiff -r1.43.2.16 -r1.43.2.17 src/sys/dev/midi.c
cvs rdiff -r1.11.14.16 -r1.11.14.17 src/sys/dev/midivar.h
cvs rdiff -r1.25.2.13 -r1.25.2.14 src/sys/dev/usb/umidi.c
cvs rdiff -r1.13.14.3 -r1.13.14.4 src/sys/sys/midiio.h

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