* debian/arch/amd64/defines,

debian/arch/i386/defines: Reenable xen.
* debian/patches/series/0experimental.1-extra
  - Use new xen patch.
  - Use wildcards.
* debian/patches/xen-tree-merge-21940.patch,
  debian/patches/xen-tree-merge-21966-update.patch: Remove.
* debian/patches/xen-tree-merge-21966.patch: Add.

svn path=/dists/trunk/linux-2.6/; revision=6197

debian/arch/amd64/defines

@@ -9,7 +9,7 @@ kernel-arch: x86_64
 kernel-header-dirs: x86_64
 subarches:
  vserver
-# xen
+ xen
 
 [image]
 depends: e2fsprogs (>= 1.35-7)

debian/arch/i386/defines

@@ -9,7 +9,7 @@ kernel-arch: i386
 kernel-header-dirs: i386
 subarches:
  vserver
-# xen
+ xen
 
 [image]
 suggests: grub | lilo (>= 19.1)

debian/patches/series/0experimental.1-extra

@@ -2,6 +2,6 @@
 + arm-nslu2-maclist.patch arm armeb
 + vserver-version.patch *_vserver
 + vserver-vs2.0.2-rc12.patch *_vserver
-+ xen-tree-merge-21940.patch amd64_xen i386_xen
++ xen-tree-merge-21966.patch *_xen
 + mips-tulip.patch mipsel
 + mips-tulip_dc21143.patch mipsel