From: cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Date: Wed, 9 Mar 2005 00:48:41 +0000 (+0000)
Subject: bitkeeper revision 1.1236.12.14 (422e47e9xlByLicbmgGE7DC-Dy4qJg)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17857^2~57^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a247c266ef2a6b87d4f33bf9b4009fcf9f3bf06b;p=xen.git

bitkeeper revision 1.1236.12.14 (422e47e9xlByLicbmgGE7DC-Dy4qJg)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/netbsd/xen-unstable.bk
---

a247c266ef2a6b87d4f33bf9b4009fcf9f3bf06b
diff --cc .rootkeys
index 79286a1f13,d15fe9d75d..f1e7482e2b
--- a/.rootkeys
+++ b/.rootkeys
@@@ -311,51 -289,14 +311,53 @@@
  413cb3b5rIKB3TbyhK3pbNyVkYysqA netbsd-2.0-xen-sparse/sys/arch/xen/xen/xen_debug.c
  413cb3b5eKxnzoodEqaWn2wrPnHWnA netbsd-2.0-xen-sparse/sys/arch/xen/xen/xencons.c
  413cb3b5F56TvQWAmO5TsuzhtzLFPQ netbsd-2.0-xen-sparse/sys/arch/xen/xen/xenkbc.c
+ 422e4430vKaHLOOGS7X-SUUe3EBCgw netbsd-2.0-xen-sparse/sys/miscfs/kernfs/kernfs.h
+ 422e4430-gOD358H8nGGnNWes08Nng netbsd-2.0-xen-sparse/sys/miscfs/kernfs/kernfs_vnops.c
  413cb3b53nyOv1OIeDSsCXhBFDXvJA netbsd-2.0-xen-sparse/sys/nfs/files.nfs
  413aa1d0oNP8HXLvfPuMe6cSroUfSA patches/linux-2.6.10/agpgart.patch
 -413aa1d0ewvSv-ohnNnQQNGsbPTTNA patches/linux-2.6.10/drm.patch
 -418abc69J3F638vPO9MYoDGeYilxoQ patches/linux-2.6.10/nettel.patch
  3f776bd1Hy9rn69ntXBhPReUFw9IEA tools/Makefile
  40e1b09db5mN69Ijj0X_Eol-S7dXiw tools/Rules.mk
 +4209033eUwhDBJ_bxejiv5c6gjXS4A tools/blktap/Makefile
 +4209033ewLAHdhGrT_2jo3Gb_5bDcA tools/blktap/README
 +42277b02mYXxgijE7MFeUe9d8eldMw tools/blktap/README-PARALLAX
 +4209033eX_Xw94wHaOCtnU9nOAtSJA tools/blktap/blkaio.c
 +4209033egwf6LDxM2hbaqi9rRdZy4A tools/blktap/blkaiolib.c
 +4209033f9yELLK85Ipo2oKjr3ickgQ tools/blktap/blkaiolib.h
 +4209033fL9LcSI6LXrIp5O4axbUBLg tools/blktap/blkcow.c
 +4209033fUDlFGZreIyZHdP7h7yfvuQ tools/blktap/blkcowgnbd.c
 +4209033fCgZzLeMOwNBFmsp99x58ZQ tools/blktap/blkcowimg.c
 +4209033frfXH6oOi9AvRz08PPAndNA tools/blktap/blkcowlib.c
 +4209033fhFd_y2go9HgCF395A35xJg tools/blktap/blkcowlib.h
 +4209033fHgtGpb_K16_xC9CpkjNZLw tools/blktap/blkdump.c
 +4209033fm61CZG1RyKDW75V-eTZ9fg tools/blktap/blkgnbd.c
 +4209033fVfa-R6MFgGcmsQHTDna4PA tools/blktap/blkgnbdlib.c
 +4209033fIgDQbaHwHStHhPEDTtbqsA tools/blktap/blkgnbdlib.h
 +4209033figp5JRsKsXY8rw4keRumkg tools/blktap/blkimg.c
 +42090340V-8HKGlr00SyJGsE5jXC3A tools/blktap/blkimglib.c
 +42090340c7pQbh0Km8zLcEqPd_3zIg tools/blktap/blkimglib.h
 +42090340_mvZtozMjghPJO0qsjk4NQ tools/blktap/blkint.h
 +42090340rc2q1wmlGn6HtiJAkqhtNQ tools/blktap/blktaplib.c
 +42090340C-WkRPT7N3t-8Lzehzogdw tools/blktap/blktaplib.h
 +42277b02WrfP1meTDPv1M5swFq8oHQ tools/blktap/blockstore.c
 +42277b02P1C0FYj3gqwTZUD8sxKCug tools/blktap/blockstore.h
 +42090340B3mDvcxvd9ehDHUkg46hvw tools/blktap/libgnbd/Makefile
 +42090340ZWkc5Xhf9lpQmDON8HJXww tools/blktap/libgnbd/gnbdtest.c
 +42090340ocMiUScJE3OpY7QNunvSbg tools/blktap/libgnbd/libgnbd.c
 +42090340G5_F_EeVnPORKB0pTMGGhA tools/blktap/libgnbd/libgnbd.h
 +42277b03930x2TJT3PZlw6o0GERXpw tools/blktap/parallax.c
 +42277b03XQYq8bujXSz7JAZ8N7j_pA tools/blktap/radix.c
 +42277b03vZ4-jno_mgKmAcCW3ycRAg tools/blktap/radix.h
 +42277b03U_wLHL-alMA0bfxGlqldXg tools/blktap/snaplog.c
 +42277b04Ryya-z662BEx8HnxNN0dGQ tools/blktap/snaplog.h
 +42277b04LxFjptgZ75Z98DUAso4Prg tools/blktap/vdi.c
 +42277b04tt5QkIvs8She8CQqH5kwpg tools/blktap/vdi.h
 +42277b04zMAhB0_946sHQ_H2vwnt0Q tools/blktap/vdi_create.c
 +42277b04xB_iUmiSm6nKcy8OV8bckA tools/blktap/vdi_fill.c
 +42277b045CJGD_rKH-ZT_-0X4knhWA tools/blktap/vdi_list.c
 +42277b043ZKx0NJSbcgptQctQ5rerg tools/blktap/vdi_snap.c
 +42277b043Fjy5-H7LyBtUPyDlZFo6A tools/blktap/vdi_snap_list.c
 +42277b04vhqD6Lq3WmGbaESoAAKdhw tools/blktap/vdi_tree.c
 +42277b047H8fTVyUf75BWAjh6Zpsqg tools/blktap/vdi_validate.c
  4124b307nRyK3dhn1hAsvrY76NuV3g tools/check/Makefile
  4124b307vHLUWbfpemVefmaWDcdfag tools/check/README
  4124b307jt7T3CHysgl9LijNHSe1tA tools/check/check_brctl