[kernel] r6134 - dists/trunk/linux-2.6/debian/patches/series

[Jurij Smakov]

Author: jurij-guest
Date: Sun Mar 12 19:42:39 2006
New Revision: 6134

Removed:
   dists/trunk/linux-2.6/debian/patches/series/0experimental.2
   dists/trunk/linux-2.6/debian/patches/series/0experimental.2-extra
Modified:
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra
Log:
Merge series files in preparation for rc6.


Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1	Sun Mar 12 19:42:39 2006
@@ -24,3 +24,6 @@
 + mips-ip22zilog_oops.patch
 + mips-scache-fix.patch
 + mips-linus-merge-post-rc5
++ s390-scripts-modpost-ccw.patch
++ s390-drivers-ccw-uevent-modalias.patch
++ s390-drivers-ccw-uevent-cleanup.patch

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra	Sun Mar 12 19:42:39 2006
@@ -5,3 +5,4 @@
 + xen-tree-merge-21940.patch amd64_xen i386_xen
 + mips-tulip.patch mipsel
 + mips-tulip_dc21143.patch mipsel
++ xen-tree-merge-21966-update.patch *_xen