diff --git a/debian/TODO.patches b/debian/TODO.patches index bf131f4ae..4a3c2bb84 100644 --- a/debian/TODO.patches +++ b/debian/TODO.patches @@ -25,8 +25,6 @@ amd64-int3-fix.patch NOT ACCEPTED | REDIFFED | INCLUDED. amd64-outs.patch NOT ACCEPTED | INCLUDED. -doc-post_halloween.patch - NOT ACCEPTED | INCLUDED. docbook-allow-preprocessor-directives-between-kernel-doc-and-function.patch ACCEPTED. docbook-fix-function-parameter-descriptin-in-fbmem.patch @@ -41,22 +39,6 @@ drivers-ide-dma-blacklist-toshiba.patch NOT ACCEPTED | INCLUDED. drivers-input-serio-8042-resume.patch ACCEPTED. -drivers-input-serio-nmouse.patch - ACCEPTED. -drivers-media-video-pll-lib-2.patch - ACCEPTED. -drivers-media-video-pll-lib.patch - ACCEPTED. -drivers-media-video-saa7134-update-2.patch - ACCEPTED. -drivers-media-video-saa7134-update.patch - ACCEPTED. -drivers-media-video-tuner-update-1.patch - ACCEPTED. -drivers-media-video-tuner-update-2.patch - ACCEPTED. -drivers-media-video-v4l-mpeg-support.patch - ACCEPTED. drivers-scsi-megaraid_splitup.patch NOT ACCEPTED | INCLUDED. fbdev-radeon-noaccel.patch @@ -88,9 +70,7 @@ modular-vesafb.patch Two hunks failed, manually corrected. net-bluetooth-signdness-fix.patch ACCEPTED. -drivers-media-video-mt352-update.patch docbook-move-kernel-doc-comment-next-to-function.patch -arch-ppc64-hugepage-aio-panic.patch Backports powerpc-calibrate-tau.patch NOT ACCEPTED | REDIFFED | INCLUDED. @@ -106,8 +86,6 @@ powerpc-pmac-agp-sleep.patch ACCEPTED. powerpc-pmac-cache-power34-fix.patch NOT ACCEPTED | INCLUDED. -powerpc-prep-motorola-irq-fix.patch - ACCEPTED. powerpc-serial.patch NOT ACCEPTED | REDIFFED | INCLUDED. powerpc-therm-adt746x-new-i2c-fix.patch diff --git a/debian/changelog b/debian/changelog index c778234a5..5289e6342 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,20 @@ linux-2.6 (2.6.12-1) UNRELEASED; urgency=low - sparc64-sunsu-init-2.6.11.patch (merged) - sunsab-uart-update-timeout.patch (merged) - alpha-read-trylock.patch (different version got merged) + - powerpc-prep-motorola-irq-fix.patch (merged) + - drivers-media-video-saa7134-update.patch (merged) + - drivers-media-video-saa7134-update-2.patch (merged) + - drivers-media-video-pll-lib.patch (merged) + - drivers-media-video-pll-lib-2.patch (merged) + - drivers-media-video-tuner-update-1.patch (merged) + - drivers-media-video-tuner-update-2.patch (merged) + - drivers-media-video-v4l-mpeg-support.patch (merged) + - drivers-media-video-mt352-update.patch (merged) + - arch-ppc64-hugepage-aio-panic.patch (merged) + - drivers-input-serio-nmouse.patch (merged) + - doc-post_halloween.patch (unless someone can come up w/ a valid + reason for carrying around rapidly bitrotting documentation...) + (Andres Salomon) * Premiere of the common-source kernel package (Jurij Smakov, Andres Salomon)