Module Name:	src
Committed By:	tron
Date:		Tue Mar 28 09:46:22 UTC 2006

Modified Files:
	src/sys/arch/xen/conf [peter-altq]: files.xen
	src/sys/arch/xen/i386 [peter-altq]: identcpu.c machdep.c
	src/sys/arch/xen/include [peter-altq]: xenbus.h
	src/sys/arch/xen/include/xen3-public/io [peter-altq]: ring.h
	src/sys/arch/xen/xen [peter-altq]: clock.c ctrl_if.c hypervisor.c
	    if_xennet.c if_xennet_xenbus.c xbd.c xengnt.c
	src/sys/arch/xen/xenbus [peter-altq]: xenbus_client.c xenbus_probe.c
	    xenbus_xs.c
Added Files:
	src/sys/arch/xen/xen [peter-altq]: xbd_xenbus.c

Log Message:
Merge 2006-03-28 NetBSD-current into the "peter-altq" branch.


To generate a diff of this commit:
cvs rdiff -r1.37 -r1.37.4.1 src/sys/arch/xen/conf/files.xen
cvs rdiff -r1.10 -r1.10.2.1 src/sys/arch/xen/i386/identcpu.c
cvs rdiff -r1.25 -r1.25.4.1 src/sys/arch/xen/i386/machdep.c
cvs rdiff -r1.2 -r1.2.2.1 src/sys/arch/xen/include/xenbus.h
cvs rdiff -r1.2 -r1.2.4.1 src/sys/arch/xen/include/xen3-public/io/ring.h
cvs rdiff -r1.18 -r1.18.2.1 src/sys/arch/xen/xen/clock.c
cvs rdiff -r1.12 -r1.12.10.1 src/sys/arch/xen/xen/ctrl_if.c
cvs rdiff -r1.21 -r1.21.4.1 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -r1.43 -r1.43.4.1 src/sys/arch/xen/xen/if_xennet.c
cvs rdiff -r1.3 -r1.3.6.1 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -r1.27 -r1.27.12.1 src/sys/arch/xen/xen/xbd.c
cvs rdiff -r0 -r1.5.2.1 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -r1.1 -r1.1.6.1 src/sys/arch/xen/xen/xengnt.c
cvs rdiff -r1.3 -r1.3.2.1 src/sys/arch/xen/xenbus/xenbus_client.c \
    src/sys/arch/xen/xenbus/xenbus_probe.c \
    src/sys/arch/xen/xenbus/xenbus_xs.c

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