Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

diff --combined include/linux/pci_ids.h
index 41aa32b,9e13377..d2ad2c4
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -911,15 -911,6 +911,15 @@@
  #define PCI_DEVICE_ID_QLOGIC_ISP1022  0x1022
  #define PCI_DEVICE_ID_QLOGIC_ISP2100  0x2100
  #define PCI_DEVICE_ID_QLOGIC_ISP2200  0x2200
 +#define PCI_DEVICE_ID_QLOGIC_ISP2300  0x2300
 +#define PCI_DEVICE_ID_QLOGIC_ISP2312  0x2312
 +#define PCI_DEVICE_ID_QLOGIC_ISP2322  0x2322
 +#define PCI_DEVICE_ID_QLOGIC_ISP6312  0x6312
 +#define PCI_DEVICE_ID_QLOGIC_ISP6322  0x6322
 +#define PCI_DEVICE_ID_QLOGIC_ISP2422  0x2422
 +#define PCI_DEVICE_ID_QLOGIC_ISP2432  0x2432
 +#define PCI_DEVICE_ID_QLOGIC_ISP2512  0x2512
 +#define PCI_DEVICE_ID_QLOGIC_ISP2522  0x2522
  
  #define PCI_VENDOR_ID_CYRIX           0x1078
  #define PCI_DEVICE_ID_CYRIX_5510      0x0000
@@@ -2107,6 -2098,8 +2107,8 @@@
  #define PCI_DEVICE_ID_TIGON3_5721     0x1659
  #define PCI_DEVICE_ID_TIGON3_5705M    0x165d
  #define PCI_DEVICE_ID_TIGON3_5705M_2  0x165e
+ #define PCI_DEVICE_ID_TIGON3_5780     0x166a
+ #define PCI_DEVICE_ID_TIGON3_5780S    0x166b
  #define PCI_DEVICE_ID_TIGON3_5705F    0x166e
  #define PCI_DEVICE_ID_TIGON3_5750     0x1676
  #define PCI_DEVICE_ID_TIGON3_5751     0x1677