r3545 - trunk/kernel/source/linux-2.6-2.6.12/debian

[Andres Salomon]

Author: dilinger
Date: 2005-07-16 08:06:35 +0000 (Sat, 16 Jul 2005)
New Revision: 3545

Modified:
   trunk/kernel/source/linux-2.6-2.6.12/debian/TODO.patches
   trunk/kernel/source/linux-2.6-2.6.12/debian/changelog
Log:
more merged drivers; also explicitly mention the dropping of
doc-post_halloween.patch, which was accidentally dropped.. but is of little
value IMO anyways..


Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/TODO.patches
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/TODO.patches	2005-07-16 07:56:09 UTC (rev 3544)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/TODO.patches	2005-07-16 08:06:35 UTC (rev 3545)
@@ -25,8 +25,6 @@
 	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 @@
 	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 @@
 	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 @@
 	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

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/changelog	2005-07-16 07:56:09 UTC (rev 3544)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/changelog	2005-07-16 08:06:35 UTC (rev 3545)
@@ -21,6 +21,20 @@
     - 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)