Merge ../linus/

diff --combined include/linux/pci_ids.h
index c99a83f88dc9b7cb07ec5a751d5608efc99d44dc,efb60d06caab24ad58c8072cf65f6df1e2238489..1e737e269db99fbf01a5436910ae1aef99e9e075
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -620,6 -620,7 +620,7 @@@
  #define PCI_DEVICE_ID_SI_961          0x0961
  #define PCI_DEVICE_ID_SI_962          0x0962
  #define PCI_DEVICE_ID_SI_963          0x0963
+ #define PCI_DEVICE_ID_SI_965          0x0965
  #define PCI_DEVICE_ID_SI_5511         0x5511
  #define PCI_DEVICE_ID_SI_5513         0x5513
  #define PCI_DEVICE_ID_SI_5518         0x5518
@@@ -1198,7 -1199,6 +1199,7 @@@
  #define PCI_DEVICE_ID_VIA_3269_0      0x0269
  #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282
  #define PCI_DEVICE_ID_VIA_8363_0      0x0305
 +#define PCI_DEVICE_ID_VIA_P4M800CE    0x0314
  #define PCI_DEVICE_ID_VIA_8371_0      0x0391
  #define PCI_DEVICE_ID_VIA_8501_0      0x0501
  #define PCI_DEVICE_ID_VIA_82C561      0x0561
@@@ -1235,6 -1235,7 +1236,7 @@@
  #define PCI_DEVICE_ID_VIA_8703_51_0   0x3148
  #define PCI_DEVICE_ID_VIA_8237_SATA   0x3149
  #define PCI_DEVICE_ID_VIA_XN266               0x3156
+ #define PCI_DEVICE_ID_VIA_6410                0x3164
  #define PCI_DEVICE_ID_VIA_8754C_0     0x3168
  #define PCI_DEVICE_ID_VIA_8235                0x3177
  #define PCI_DEVICE_ID_VIA_8385_0      0x3188
@@@ -1402,6 -1403,7 +1404,7 @@@
  #define PCI_SUBDEVICE_ID_KEYSPAN_SX2  0x5334
  
  #define PCI_VENDOR_ID_MARVELL         0x11ab
+ #define PCI_DEVICE_ID_MARVELL_GT64111 0x4146
  #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430
  #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460
  #define PCI_DEVICE_ID_MARVELL_MV64460 0x6480