Merge /dists/sid/linux-2.6.

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

debian/arch/powerpc/defines

@@ -4,7 +4,6 @@ flavours:
  powerpc-smp
  powerpc-miboot
  powerpc64
- prep
 kernel-header-dirs: powerpc ppc m68k
 kernel-arch: powerpc
 kpkg-subarch: ppc

debian/changelog

@@ -48,13 +48,17 @@ linux-2.6 (2.6.16-15) UNRELEASED; urgency=low
   [ 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@debian.org>  Fri, 26 May 2006 10:42:10 +0200
+  [ Bastian Blank ]
+  * Update vserver patch to 2.0.2-rc21.
+
+ -- Bastian Blank <waldi@debian.org>  Fri, 26 May 2006 14:59:27 +0200
 
 linux-2.6 (2.6.16-14) unstable; urgency=low