From 610ab786296406a4d629c75c50f24a7af6b841a2 Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Sun, 26 Jun 2005 18:45:36 +0000 Subject: [PATCH] add some comments svn path=/branches/linux-kernel-2.6.12/; revision=3401 --- debian/changelog | 2 ++ debian/patches-debian/drivers-ide-__devinit.patch | 1 + debian/patches-debian/drivers-ide-dma-blacklist-toshiba.patch | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 467048b58..7c3da5697 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ linux-kernel-2.6.12 (2.6.12-1) UNRELEASED; urgency=low - 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: diff --git a/debian/patches-debian/drivers-ide-__devinit.patch b/debian/patches-debian/drivers-ide-__devinit.patch index 085cf80da..664c43f7b 100644 --- a/debian/patches-debian/drivers-ide-__devinit.patch +++ b/debian/patches-debian/drivers-ide-__devinit.patch @@ -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 diff --git a/debian/patches-debian/drivers-ide-dma-blacklist-toshiba.patch b/debian/patches-debian/drivers-ide-dma-blacklist-toshiba.patch index c929c69e0..9dbb62229 100644 --- a/debian/patches-debian/drivers-ide-dma-blacklist-toshiba.patch +++ b/debian/patches-debian/drivers-ide-dma-blacklist-toshiba.patch @@ -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