From 5d9bcb6b0934d8ec736f3fbea6a2cd78c0b05ab4 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 28 May 2006 19:46:31 +0000 Subject: [PATCH] Merge /dists/sid/linux-2.6. svn path=/dists/trunk/linux-2.6/; revision=6720 --- debian/arch/powerpc/defines | 1 - debian/changelog | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/arch/powerpc/defines b/debian/arch/powerpc/defines index 498a62e11..0ea4faba8 100644 --- a/debian/arch/powerpc/defines +++ b/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 diff --git a/debian/changelog b/debian/changelog index e73037163..11f509912 100644 --- a/debian/changelog +++ b/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 Fri, 26 May 2006 10:42:10 +0200 + [ Bastian Blank ] + * Update vserver patch to 2.0.2-rc21. + + -- Bastian Blank Fri, 26 May 2006 14:59:27 +0200 linux-2.6 (2.6.16-14) unstable; urgency=low