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

diff --combined include/linux/pci_ids.h
index 486d1c1676bda61582e7dd031e86c3302e27d28c,3dc161894c7b61bb4ce57c84568fe197bcc6ba5f..c49d28eca561852803437ecc3555cec52bad8413
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -491,6 -491,7 +491,7 @@@
  #define PCI_DEVICE_ID_AMI_MEGARAID2   0x9060
  
  #define PCI_VENDOR_ID_AMD             0x1022
+ #define PCI_DEVICE_ID_AMD_K8_NB               0x1100
  #define PCI_DEVICE_ID_AMD_LANCE               0x2000
  #define PCI_DEVICE_ID_AMD_LANCE_HOME  0x2001
  #define PCI_DEVICE_ID_AMD_SCSI                0x2020
@@@ -2252,9 -2253,6 +2253,9 @@@
  
  #define PCI_VENDOR_ID_INFINICON               0x1820
  
 +#define PCI_VENDOR_ID_SITECOM         0x182d
 +#define PCI_DEVICE_ID_SITECOM_DC105V2 0x3069
 +
  #define PCI_VENDOR_ID_TOPSPIN         0x1867
  
  #define PCI_VENDOR_ID_TDI               0x192E