diff --git a/debian/changelog b/debian/changelog index 4320cc702..01b8544be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,11 @@ linux-2.6 (2.6.14+2.6.15-rc4-0experimental.1) UNRELEASED; urgency=low possibly soon if it proves to be a source of bugs. (closes: #340388) + [ Jurij Smakov ] + * Drop tty-locking-fixes9.patch, which was preventing the oops during + shutdown on some sparc machines with serial console. Proper fix has + been incorporated upstream. + -- Simon Horman Wed, 30 Nov 2005 16:42:57 +0900 linux-2.6 (2.6.14-3) unstable; urgency=low diff --git a/debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1 b/debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1 index 4a44e5eb2..487699aef 100644 --- a/debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1 +++ b/debian/patches-debian/series/2.6.14+2.6.15-rc4-0experimental.1 @@ -9,7 +9,7 @@ + powerpc-serial.patch #+ remove-references-to-removed-drivers.patch + sparc64-hme-lockup.patch -+ tty-locking-fixes9.patch +#+ tty-locking-fixes9.patch + version.patch #+ powerpc-mv643xx-hotplug-support.patch #+ powerpc-apus.patch