* debian/arch/amd64/defines, debian/arch/i386/defines,

debian/arch/powerpc/defines: Reenable vserver.
* debian/patches/series/0experimental.1-extra: Update.
* debian/patches/vserver-vs2.0.2-rc10.patch: Add.
* debian/patches/vserver-vs2.0.2-rc9.patch: Remove.

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

debian/arch/amd64/defines

@@ -8,7 +8,7 @@ flavours:
  em64t-p4-smp
 kernel-arch: x86_64
 kernel-header-dirs: x86_64
-#subarches: vserver
+subarches: vserver
 suggests: grub | lilo (>= 19.1)
 
 [amd64-generic]

debian/arch/i386/defines

@@ -8,7 +8,7 @@ flavours:
  k7-smp
 kernel-arch: i386
 kernel-header-dirs: i386
-#subarches: vserver
+subarches: vserver
 suggests: grub | lilo (>= 19.1)
 
 [686]

debian/arch/powerpc/defines

@@ -8,7 +8,7 @@ flavours:
 kernel-header-dirs: powerpc ppc m68k
 kernel-arch: powerpc
 kpkg-subarch: ppc
-#subarches: vserver
+subarches: vserver
 
 [apus]
 depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)

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

@@ -1,7 +1,7 @@
 + maclist.patch arm armeb
 + arm-nslu2-maclist.patch arm armeb
 + vserver-version.patch amd64_vserver i386_vserver hppa_vserver powerpc_vserver
-+ vserver-vs2.0.2-rc9.patch amd64_vserver i386_vserver powerpc_vserver
-+ xen-merge.patch amd64_xen i386_xen
++ vserver-vs2.0.2-rc10.patch amd64_vserver i386_vserver powerpc_vserver
+#+ xen-merge.patch amd64_xen i386_xen
 + mips-tulip.patch mipsel
 + mips-tulip_dc21143.patch mipsel