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

debian/arch/powerpc/defines: Reenable vserver.
* debian/patches/series/0experimental.1-extra
  - Use new vserver patch.
  - Use wildcards.
* debian/patches/vserver-vs2.0.2-rc10.patch: Remove.
* debian/patches/vserver-vs2.0.2-rc12.patch: Add.

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

debian/arch/amd64/defines

@@ -8,7 +8,7 @@ flavours:
 kernel-arch: x86_64
 kernel-header-dirs: x86_64
 subarches:
-# vserver
+ vserver
 # xen
 
 [image]

debian/arch/i386/defines

@@ -8,7 +8,7 @@ flavours:
 kernel-arch: i386
 kernel-header-dirs: i386
 subarches:
-# vserver
+ vserver
 # xen
 
 [image]

debian/arch/powerpc/defines

@@ -8,7 +8,7 @@ kernel-header-dirs: powerpc ppc m68k
 kernel-arch: powerpc
 kpkg-subarch: ppc
 subarches:
-# vserver
+ vserver
 
 [image]
 

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-rc10.patch amd64_vserver i386_vserver powerpc_vserver
++ vserver-version.patch *_vserver
++ vserver-vs2.0.2-rc12.patch *_vserver
 + xen-tree-merge-21940.patch amd64_xen i386_xen
 + mips-tulip.patch mipsel
 + mips-tulip_dc21143.patch mipsel