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

[Maximilian Attems]

Author: maks
Date: Fri Apr 25 11:22:15 2008
New Revision: 11165

Log:
git sync disable one last conflicting arm patch


Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Fri Apr 25 11:22:15 2008
@@ -18,7 +18,7 @@
 + bugfix/powerpc/serial.patch
 + bugfix/arm/orion-enawrallo.patch
 + features/arm/ixp4xx-net-drivers.patch
-+ features/arm/linkstation.patch
+##+ features/arm/linkstation.patch
 ##+ features/arm/orion-mv88f5281-d0.patch
 ##+ features/arm/ts409.patch
 + features/all/rtc-pcf8563-new-style-conversion.patch