Module Name:	src
Committed By:	peter
Date:		Fri Jun  9 19:52:36 UTC 2006

Modified Files:
	src/sys/altq [peter-altq]: altq_afmap.c altq_blue.c altq_cbq.c
	    altq_cdnr.c altq_conf.c altq_fifoq.c altq_hfsc.c altq_jobs.c
	    altq_priq.c altq_red.c altq_rio.c altq_rmclass.c altq_subr.c
	    altq_wfq.c

Log Message:
Merge 2006-05-24 NetBSD-current into the peter-altq branch.


To generate a diff of this commit:
cvs rdiff -r1.9.12.1 -r1.9.12.2 src/sys/altq/altq_afmap.c \
    src/sys/altq/altq_priq.c src/sys/altq/altq_wfq.c
cvs rdiff -r1.12.12.1 -r1.12.12.2 src/sys/altq/altq_blue.c \
    src/sys/altq/altq_conf.c src/sys/altq/altq_hfsc.c
cvs rdiff -r1.12.12.2 -r1.12.12.3 src/sys/altq/altq_cbq.c
cvs rdiff -r1.10.12.1 -r1.10.12.2 src/sys/altq/altq_cdnr.c
cvs rdiff -r1.7.12.1 -r1.7.12.2 src/sys/altq/altq_fifoq.c
cvs rdiff -r1.1.2.1 -r1.1.2.2 src/sys/altq/altq_jobs.c
cvs rdiff -r1.13.12.2 -r1.13.12.3 src/sys/altq/altq_red.c
cvs rdiff -r1.8.12.1 -r1.8.12.2 src/sys/altq/altq_rio.c
cvs rdiff -r1.12.6.1 -r1.12.6.2 src/sys/altq/altq_rmclass.c
cvs rdiff -r1.13.12.1 -r1.13.12.2 src/sys/altq/altq_subr.c

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