[kernel] r6720 - in dists/trunk/linux-2.6: . debian

[Bastian Blank]

Author: waldi
Date: Sun May 28 19:46:31 2006
New Revision: 6720

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/arch/powerpc/defines
   dists/trunk/linux-2.6/debian/changelog

Log:
Merge /dists/sid/linux-2.6.


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	Sun May 28 19:46:31 2006
@@ -4,7 +4,6 @@
  powerpc-smp
  powerpc-miboot
  powerpc64
- prep
 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	Sun May 28 19:46:31 2006
@@ -48,13 +48,17 @@
   [ Kyle McMartin ]
   * [hppa] Pulled patch from cvs to fix build of kernel/ptrace.c which needs
     {read,write}_can_lock.
+  * [hppa] Disable CONFIG_DETECT_SOFTLOCKUP to fix boot on pa8800 machines.
 
   [ Sven Luther ]
   * [powerpc,prep] Added a new ARCH=ppc PReP flavour, currently mostly a copy
     of the -powerpc one.
   * Upgraded mkvmlinuz dependency to mkvmlinuz 21.
 
- -- Sven Luther <luther at debian.org>  Fri, 26 May 2006 10:42:10 +0200
+  [ Bastian Blank ]
+  * Update vserver patch to 2.0.2-rc21.
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 26 May 2006 14:59:27 +0200
 
 linux-2.6 (2.6.16-14) unstable; urgency=low