[kernel] r7360 - in dists/trunk/linux-2.6/debian: . arch/powerpc

[Bastian Blank]

Author: waldi
Date: Thu Sep  7 09:18:17 2006
New Revision: 7360

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/defines
   dists/trunk/linux-2.6/debian/changelog

Log:
Revert r7359: Always merge _all_ sensible changes since the last merge without
breaking the state which defines the merge base.


Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/defines	Thu Sep  7 09:18:17 2006
@@ -4,8 +4,6 @@
  powerpc-smp
  powerpc-miboot
  powerpc64
- prep
-# apus
 kernel-header-dirs: powerpc ppc m68k
 kernel-arch: powerpc
 kpkg-subarch: ppc

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Sep  7 09:18:17 2006
@@ -5,10 +5,7 @@
   * arm/iop32x: Build ext2/3 as modules.
   * arm/iop32x: Disable CONFIG_EMBEDDED.
 
-  [ Sven Luther ]
-  * [powerpc] Enabled the -prep flavour.
-
- -- Sven Luther <sven at tael.powerlinux.fr>  Thu,  7 Sep 2006 11:06:50 +0200
+ -- Bastian Blank <waldi at debian.org>  Tue,  5 Sep 2006 11:05:54 +0200
 
 linux-2.6 (2.6.17+2.6.18-rc6-0experimental.1) UNRELEASED; urgency=low
 
@@ -16,20 +13,7 @@
 
  -- Bastian Blank <waldi at debian.org>  Tue,  5 Sep 2006 11:05:54 +0200
 
-linux-2.6 (2.6.17-9) UNRELEASED; urgency=low
-
-  [ dann frazier ]
-  * drivers-ide-pci-via82cxxx-vt8237a-id.patch,
-    drivers-ide-pci-via82cxxx-vt8237a-id-2.patch:
-    Add missing PCI ID for VT8237A chips, reported by Radek Oliwa.
-
-  [ Bastian Blank ]
-  * Update vserver patch to 2.0.2.
-    - Fix possible priviledge escalation in remount code. (CVE-2006-4243)
-
- -- Bastian Blank <waldi at debian.org>  Mon,  4 Sep 2006 18:20:24 +0200
-
-linux-2.6 (2.6.17-8) unstable; urgency=low
+linux-2.6 (2.6.17-8) UNRELEASED; urgency=low
 
   [ Martin Michlmayr ]
   * arm/ixp4xx: Enable CONFIG_W1.
@@ -40,23 +24,7 @@
     Updates to patch_sigmatel.c to add x86 mac-mini sound support
     Thanks to Matt Kraai. (closes: #384972)
 
-  [ Kyle McMartin ]
-  * hppa: Re-enable pa8800 fixing patches from James Bottomley.
-    Pulled fresh from parisc-linux git tree.
-  * ia64: Pull in compile-failure fix from Christian Cotte-Barrot.
-    Pulled from linux-ia64 mailing list. Fix is correct.
-  * hppa/alpha/mips: Fix compile-failure due to missing arch_mmap_check. Patch sent
-    upstream to stable at kernel.org.
-
-  [ dann frazier ]
-  * sym2: only claim "Storage" class devices - the cpqarray driver should be
-    used for 5c1510 devices in RAID mode. (closes: #380272)
-
-  [ Bastian Blank ]
-  * Backport change to allow all hypercalls for xen.
-
- -- Bastian Blank <waldi at debian.org>  Thu, 31 Aug 2006 12:12:51 +0200
-
+ -- dann frazier <dannf at debian.org>  Tue, 29 Aug 2006 00:06:48 -0600
 
 linux-2.6 (2.6.17-7) unstable; urgency=low