Revert r8527. The new version is broken.

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

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 <tbm@cyrius.com>  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 <maks@debian.org>  Sat, 28 Apr 2007 18:53:40 +0200
 

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