aboutsummaryrefslogtreecommitdiffstats
path: root/.rootkeys
diff options
context:
space:
mode:
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2005-06-13 13:18:11 +0000
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2005-06-13 13:18:11 +0000
commitaebe1ba48e325270c3dd5c48d78fd1e87d2db125 (patch)
tree5ce5b6bde03a375d6aba8edad9550934ba5e6393 /.rootkeys
parent056548d9bc5e3e6318c53e9569cd67b9fc254616 (diff)
parentad25d356d1d4675daaaf3cf551a5c5491a2ef7de (diff)
downloadxen-aebe1ba48e325270c3dd5c48d78fd1e87d2db125.tar.gz
xen-aebe1ba48e325270c3dd5c48d78fd1e87d2db125.tar.bz2
xen-aebe1ba48e325270c3dd5c48d78fd1e87d2db125.zip
bitkeeper revision 1.1713.1.2 (42ad8793XA-gObRPsPuWlI4gxZ7j5Q)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk into freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
Diffstat (limited to '.rootkeys')
-rw-r--r--.rootkeys2
1 files changed, 1 insertions, 1 deletions
diff --git a/.rootkeys b/.rootkeys
index 30f525d435..f8d113f0e6 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -468,7 +468,7 @@
413aa1d0oNP8HXLvfPuMe6cSroUfSA patches/linux-2.6.11/agpgart.patch
427261074Iy1MkbbqIV6zdZDWWx_Jg patches/linux-2.6.11/i386-cpu-hotplug-updated-for-mm.patch
42372652KCUP-IOH9RN19YQmGhs4aA patches/linux-2.6.11/iomap.patch
-428359d4b3fDYtazwXi4UUmSWaOUew patches/linux-2.6.11/linux-2.6.11.11.patch
+428359d4b3fDYtazwXi4UUmSWaOUew patches/linux-2.6.11/linux-2.6.11.12.patch
4296fb998LGSWCcljGKbOCUv3h9uRQ patches/linux-2.6.11/net-csum.patch
429ae875I9ZrqrRDjGD34IC2kzDREw patches/linux-2.6.11/rcu-nohz.patch
429ba3007184K-y6WHQ6KgY65-lEIQ patches/linux-2.6.11/udp-frag.patch