r3401 - in branches/linux-kernel-2.6.12/debian: . patches-debian

[maximilian attems]

Author: maks-guest
Date: 2005-06-26 18:45:36 +0000 (Sun, 26 Jun 2005)
New Revision: 3401

Modified:
   branches/linux-kernel-2.6.12/debian/changelog
   branches/linux-kernel-2.6.12/debian/patches-debian/drivers-ide-__devinit.patch
   branches/linux-kernel-2.6.12/debian/patches-debian/drivers-ide-dma-blacklist-toshiba.patch
Log:
add some comments


Modified: branches/linux-kernel-2.6.12/debian/changelog
===================================================================
--- branches/linux-kernel-2.6.12/debian/changelog	2005-06-25 19:14:34 UTC (rev 3400)
+++ branches/linux-kernel-2.6.12/debian/changelog	2005-06-26 18:45:36 UTC (rev 3401)
@@ -7,6 +7,8 @@
     - restored Philips webcam driver
     - new Broadcom bcm5706 gigabit driver
     - new resource limits for the audio community
+    - Multipath device mapper
+    - Intel HD Audio alsa driver
     - fixes + arch updates..
   * Premiere of the common-source kernel package. (Jurij Smakov)
   * Dropping support for the x86-i486 emu patch:

Modified: branches/linux-kernel-2.6.12/debian/patches-debian/drivers-ide-__devinit.patch
===================================================================
--- branches/linux-kernel-2.6.12/debian/patches-debian/drivers-ide-__devinit.patch	2005-06-25 19:14:34 UTC (rev 3400)
+++ branches/linux-kernel-2.6.12/debian/patches-debian/drivers-ide-__devinit.patch	2005-06-26 18:45:36 UTC (rev 3401)
@@ -1,3 +1,4 @@
+## DP: Upstream status: submitted
 diff -aurN a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
 --- a/drivers/ide/pci/alim15x3.c	2005-06-06 11:22:29.000000000 -0400
 +++ b/drivers/ide/pci/alim15x3.c	2005-06-15 22:01:23.000000000 -0400

Modified: branches/linux-kernel-2.6.12/debian/patches-debian/drivers-ide-dma-blacklist-toshiba.patch
===================================================================
--- branches/linux-kernel-2.6.12/debian/patches-debian/drivers-ide-dma-blacklist-toshiba.patch	2005-06-25 19:14:34 UTC (rev 3400)
+++ branches/linux-kernel-2.6.12/debian/patches-debian/drivers-ide-dma-blacklist-toshiba.patch	2005-06-26 18:45:36 UTC (rev 3401)
@@ -5,7 +5,7 @@
 ## DP: Description: blacklist "TOSHIBA CD-ROM XM-1702BC" in drivers/ide/ide-dma.c
 ## DP: Patch author: Herbert Xu -> #222939
 ##	see also -> http://lists.debian.org/debian-boot/1999/02/msg00016.html
-## DP: Upstream status: not submitted
+## DP: Upstream status: submitted
 
 . $(dirname $0)/DPATCH