The following commit has been merged in the master branch:
commit 6babeca476c5f3803320527521a5ac4c64fb4e44
Author: Samuel Thibault <[email protected]>
Date: Mon Nov 19 16:55:41 2012 +0100
mark as merged upstream
diff --git a/debian/patches/10_cdromlock.patch
b/debian/patches/10_cdromlock.patch
index 436f97c..6401fc8 100644
--- a/debian/patches/10_cdromlock.patch
+++ b/debian/patches/10_cdromlock.patch
@@ -1,3 +1,5 @@
+merged upstream
+
Index: b/linux/dev/glue/block.c
===================================================================
--- a/linux/dev/glue/block.c
diff --git a/debian/patches/13_ide_dma.patch b/debian/patches/13_ide_dma.patch
index 2a950fa..d7da74f 100644
--- a/debian/patches/13_ide_dma.patch
+++ b/debian/patches/13_ide_dma.patch
@@ -3,6 +3,7 @@ supporting hardware.
2004-09-17 Sergio Lopez <[email protected]>
+merged upstream
Index: b/linux/src/drivers/block/ide.c
===================================================================
diff --git a/debian/patches/24_pci_irq_fix.patch
b/debian/patches/24_pci_irq_fix.patch
index cba0cab..26b4319 100644
--- a/debian/patches/24_pci_irq_fix.patch
+++ b/debian/patches/24_pci_irq_fix.patch
@@ -17,6 +17,7 @@ the device is not being used for unassigned IRQ.
if we are getting an invalid IRQ >= 16 and different from 255 (it
happens in some motherboard).
+merged upstream
Index: b/linux/src/drivers/net/pci-scan.c
===================================================================
--
Debian GNU Mach packaging
