Let's do abiname=1 :)

Purged duplicate name entry.

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

debian/arch/defines

@@ -1,5 +1,5 @@
 [base]
-abiname: 2
+abiname: 1
 arches:
  alpha
  amd64

debian/changelog

@@ -2,16 +2,6 @@ linux-2.6 (2.6.15-1) unstable; urgency=low
 
   [ Sven Luther ]
   * New upstream release.
-
-  [ Bastian Blank ]
-  * [s390] Update configs.
-
-  [ Kyle McMartin ]
-  * [hppa] Snag latest hppa.diff from cvs.parisc-linux.org.
-  * [hppa] Update configs for 2.6.15.
-  * [hppa] Change parisc kernel names to something less ambiguous.
-
-  [ Sven Luther ]
   * [powerpc] Now use ARCH=powerpc for 64bit powerpc flavours, 32bit still
     stays with ARCH=ppc for now.
   * [powerpc] Readded PReP Motorola PowerStack II Utah IDE interrupt
@@ -25,6 +15,14 @@ linux-2.6 (2.6.15-1) unstable; urgency=low
     files together, not use the kconfig.ml script to read in the files from
     more generic to more specific, and keep only the more specific.
 
+  [ Bastian Blank ]
+  * [s390] Update configs.
+
+  [ Kyle McMartin ]
+  * [hppa] Snag latest hppa.diff from cvs.parisc-linux.org.
+  * [hppa] Update configs for 2.6.15.
+  * [hppa] Change parisc kernel names to something less ambiguous.
+
   [ dann frazier ]
   * [ia64] Update ia64 configs