Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

diff --combined include/linux/pci_ids.h
index cd62a39ce06840913844482718c8807bff722bfb,8cadfdeef67494bc4b615b96ac25c054597287b0..9a96f05883935a32955b216fcc3184bf162b0a85
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -519,7 -519,6 +519,7 @@@
  #define PCI_DEVICE_ID_MATROX_MIL      0x0519
  #define PCI_DEVICE_ID_MATROX_MYS      0x051A
  #define PCI_DEVICE_ID_MATROX_MIL_2    0x051b
 +#define PCI_DEVICE_ID_MATROX_MYS_AGP  0x051e
  #define PCI_DEVICE_ID_MATROX_MIL_2_AGP        0x051f
  #define PCI_DEVICE_ID_MATROX_MGA_IMP  0x0d10
  #define PCI_DEVICE_ID_MATROX_G100_MM  0x1000
@@@ -1786,6 -1785,7 +1786,7 @@@
  #define PCI_DEVICE_ID_TIGON3_5704     0x1648
  #define PCI_DEVICE_ID_TIGON3_5704S_2  0x1649
  #define PCI_DEVICE_ID_NX2_5706                0x164a
+ #define PCI_DEVICE_ID_NX2_5708                0x164c
  #define PCI_DEVICE_ID_TIGON3_5702FE   0x164d
  #define PCI_DEVICE_ID_TIGON3_5705     0x1653
  #define PCI_DEVICE_ID_TIGON3_5705_2   0x1654
@@@ -1810,6 -1810,7 +1811,7 @@@
  #define PCI_DEVICE_ID_TIGON3_5703X    0x16a7
  #define PCI_DEVICE_ID_TIGON3_5704S    0x16a8
  #define PCI_DEVICE_ID_NX2_5706S               0x16aa
+ #define PCI_DEVICE_ID_NX2_5708S               0x16ac
  #define PCI_DEVICE_ID_TIGON3_5702A3   0x16c6
  #define PCI_DEVICE_ID_TIGON3_5703A3   0x16c7
  #define PCI_DEVICE_ID_TIGON3_5781     0x16dd