r2231 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches/series

[Norbert Tretkowski]

Author: nobse
Date: 2005-01-09 19:48:58 +0100 (Sun, 09 Jan 2005)
New Revision: 2231

Modified:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-3
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4
Log:
changes should go into 2.6.10-4, not 2.6.10-3


Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-01-09 18:43:59 UTC (rev 2230)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-01-09 18:48:58 UTC (rev 2231)
@@ -15,6 +15,8 @@
 
   * Drop drivers-input-psaux-hacks.dpatch, the patch has effictively disabled
     by every architecture setting INPUT_MOUSEDEV_PSAUX_ENABLE to 'y' already.
+
+   * [alpha] Added a fix for ext3 oops. (Norbert Tretkowski)
  
  -- Christoph Hellwig <hch@lst.de>  Sun, 09 Jan 2005 12:09:25 +0100
 
@@ -37,8 +39,6 @@
       ia64-irq-affinity-upfix.dpatch
       ia64-bte_error-missing-include.dpatch
 
-  * [alpha] Added a fix for ext3 oops. (Norbert Tretkowski)
-
  -- Andres Salomon <dilinger@voxel.net>  Sat, 08 Jan 2005 23:33:11 -0500
 
 kernel-source-2.6.10 (2.6.10-2) unstable; urgency=low

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-3
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-3	2005-01-09 18:43:59 UTC (rev 2230)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-3	2005-01-09 18:48:58 UTC (rev 2231)
@@ -2,5 +2,3 @@
 + 032-do_brk_security_fixes.dpatch
 + ia64-bte_error-missing-include.dpatch
 + ia64-irq-affinity-upfix.dpatch
-+ fix-mxser-compile.dpatch
-+ fix-alpha-ext3-oops.dpatch

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4	2005-01-09 18:43:59 UTC (rev 2230)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-4	2005-01-09 18:48:58 UTC (rev 2231)
@@ -5,3 +5,5 @@
 + drivers-ide-__devinit.dpatch
 - alsa-module-load-fix.dpatch
 - drivers-input-psaux-hacks.dpatch
++ fix-mxser-compile.dpatch
++ fix-alpha-ext3-oops.dpatch