From 32f999345414a1966f41295dc1dc8a25ac0495d0 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 1 May 2007 16:29:01 +0000 Subject: [PATCH] Revert r8527. The new version is broken. svn path=/dists/trunk/linux-2.6/; revision=8537 --- debian/changelog | 15 +++------------ debian/patches/series/{1 => 1~experimental.1} | 1 - .../series/{1-extra => 1~experimental.1-extra} | 0 3 files changed, 3 insertions(+), 13 deletions(-) rename debian/patches/series/{1 => 1~experimental.1} (98%) rename debian/patches/series/{1-extra => 1~experimental.1-extra} (100%) diff --git a/debian/changelog b/debian/changelog index cfce460bf..15d5878f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,3 @@ -linux-2.6 (2.6.21-1) UNRELEASED; urgency=low - - [ Martin Michlmayr ] - * arm/iop32x: Don't build CONFIG_ATA into the kernel. - * arm/ixp4xx: Enable more SATA drivers. - * arm/ixp4xx: Enable PATA_ARTOP which is needed by the nas100d. - * arm/ixp4xx: Set CONFIG_USB_EHCI_TT_NEWSCHED. - * mips/4kc-malta: Add an image for the MIPS Malta board. Thanks, - Aurelien Jarno. (closes: #421377) - - -- Martin Michlmayr Sat, 28 Apr 2007 09:37:04 +0200 - linux-2.6 (2.6.21-1~experimental.1) UNRELEASED; urgency=low [ maximilian attems ] @@ -34,6 +22,9 @@ linux-2.6 (2.6.21-1~experimental.1) UNRELEASED; urgency=low because MACH_TYPE_EP80219 is not defined. * mips/sb1: Don't build CONFIG_ATA into the kernel. * mips/sb1: Unset CONFIG_USB_{KBD,MOUSE} since the generic HID is used. + * arm/iop32x: Don't build CONFIG_ATA into the kernel. + * arm/ixp4xx: Enable more SATA drivers. + * arm/ixp4xx: Enable PATA_ARTOP which is needed by the nas100d. -- maximilian attems Sat, 28 Apr 2007 18:53:40 +0200 diff --git a/debian/patches/series/1 b/debian/patches/series/1~experimental.1 similarity index 98% rename from debian/patches/series/1 rename to debian/patches/series/1~experimental.1 index cb8b32063..36d2e4c68 100644 --- a/debian/patches/series/1 +++ b/debian/patches/series/1~experimental.1 @@ -36,4 +36,3 @@ + bugfix/forcedeth-napi-broken.patch + bugfix/powerpc/drivers_macintosh-broken.patch + bugfix/ia64/hardcode-arch-script-output.patch -+ bugfix/2.6.21.1 diff --git a/debian/patches/series/1-extra b/debian/patches/series/1~experimental.1-extra similarity index 100% rename from debian/patches/series/1-extra rename to debian/patches/series/1~experimental.1-extra