Branch: b1_4_smallfix

Remove patches unused by any series file.
A small number of updates from b1_2.
b=4611

diff --git a/lustre/kernel_patches/patches/e1000-affinity.patch b/lustre/kernel_patches/patches/e1000-affinity.patch
deleted file mode 100644 (file)
index c083c65..0000000
--- a/lustre/kernel_patches/patches/e1000-affinity.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -p -u linux-2.4/drivers/net/e1000/e1000_main.c /tmp/drivers/net/e1000/e1000_main.c 
---- linux-2.4/drivers/net/e1000/e1000_main.c   2004-06-04 17:07:49.000000000 +0100
-+++ /tmp/drivers/net/e1000/e1000_main.c        2004-06-04 17:07:42.000000000 +0100
-@@ -462,6 +462,7 @@ e1000_probe(struct pci_dev *pdev,
-       netdev->mem_start = mmio_start;
-       netdev->mem_end = mmio_start + mmio_len;
-       netdev->base_addr = adapter->hw.io_base;
-+      netdev->irq = pdev->irq;
- 
-       adapter->bd_number = cards_found;
- 
-