aboutsummaryrefslogtreecommitdiffstats
path: root/.rootkeys
diff options
context:
space:
mode:
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-05-30 10:20:47 +0000
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>2005-05-30 10:20:47 +0000
commit65ac2b823bc316df2ff927e17d05b6213fe15ae7 (patch)
treefde309bfdf49af4f60be40c06a08eb7ece6e3423 /.rootkeys
parent24f634099d2d725db11eee47a2544cf6a052206e (diff)
parent1b3ead1336bc92ee90a23a38f3432227b20b5b22 (diff)
downloadxen-65ac2b823bc316df2ff927e17d05b6213fe15ae7.tar.gz
xen-65ac2b823bc316df2ff927e17d05b6213fe15ae7.tar.bz2
xen-65ac2b823bc316df2ff927e17d05b6213fe15ae7.zip
bitkeeper revision 1.1592 (429ae8ff33cT5EmG9lUTaMO920vjKg)
Manual merge.
Diffstat (limited to '.rootkeys')
-rw-r--r--.rootkeys1
1 files changed, 1 insertions, 0 deletions
diff --git a/.rootkeys b/.rootkeys
index 9cb513b242..bb993411e2 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -471,6 +471,7 @@
42372652KCUP-IOH9RN19YQmGhs4aA patches/linux-2.6.11/iomap.patch
428359d4b3fDYtazwXi4UUmSWaOUew patches/linux-2.6.11/linux-2.6.11.10.patch
4296fb998LGSWCcljGKbOCUv3h9uRQ patches/linux-2.6.11/net-csum.patch
+429ae875I9ZrqrRDjGD34IC2kzDREw patches/linux-2.6.11/rcu-nohz.patch
424f001e_M1Tnxc52rDrmCLelnDWMQ patches/linux-2.6.11/x86_64-linux.patch
3f776bd1Hy9rn69ntXBhPReUFw9IEA tools/Makefile
40e1b09db5mN69Ijj0X_Eol-S7dXiw tools/Rules.mk