diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-19 16:55:41 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-19 16:55:41 +0100 |
| commit | 4aabe7e914ddcf1b4109fa96381a920ea5a097c9 (patch) | |
| tree | b1f9ccbb077ce666715fa46000c86b79592d7941 | |
| parent | a75a4ae1ad81da72a199b46a8a82e6b06c54d0c1 (diff) | |
mark as merged upstream
| -rw-r--r-- | debian/patches/10_cdromlock.patch | 2 | ||||
| -rw-r--r-- | debian/patches/13_ide_dma.patch | 1 | ||||
| -rw-r--r-- | debian/patches/24_pci_irq_fix.patch | 1 |
3 files changed, 4 insertions, 0 deletions
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 <koro@sinrega.org> +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 =================================================================== |