diff --git a/debian/TODO.patches b/debian/TODO.patches index d5236caf6..d8c9d31a9 100644 --- a/debian/TODO.patches +++ b/debian/TODO.patches @@ -23,8 +23,6 @@ remove-references-to-removed-drivers.patch NOT ACCEPTED | REDIFFED | INCLUDED. amd64-int3-fix.patch NOT ACCEPTED | REDIFFED | INCLUDED. -amd64-outs.patch - NOT ACCEPTED | INCLUDED. docbook-allow-preprocessor-directives-between-kernel-doc-and-function.patch ACCEPTED. docbook-fix-function-parameter-descriptin-in-fbmem.patch diff --git a/debian/changelog b/debian/changelog index e10880d97..7f2d2b46f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ linux-2.6 (2.6.12-1) UNRELEASED; urgency=low until further alpha testing is done) - x86-i486_emu.patch (buggy and insecure 80486 instruction emulation for 80386; we're no longer supporting this) + - amd64-outs.patch (according to + http://www.ussg.iu.edu/hypermail/linux/kernel/0502.3/1095.html, this + is unnecessary for us) (Andres Salomon) - sparc64-rtc-mostek.patch (merged) - sparc64-compat-nanoseconds.patch (merged) - sparc64-sunsu-init-2.6.11.patch (merged) diff --git a/debian/patches-debian/series/2.6.12-1 b/debian/patches-debian/series/2.6.12-1 index d464eec6a..60edc0fb7 100644 --- a/debian/patches-debian/series/2.6.12-1 +++ b/debian/patches-debian/series/2.6.12-1 @@ -1,5 +1,4 @@ + amd64-int3-fix.patch -+ amd64-outs.patch + drivers-add-scsi_changer.patch + drivers-ide-__devinit.patch + drivers-ide-dma-blacklist-toshiba.patch