Merge branch 'master'

diff --combined include/linux/pci_ids.h
index 6a1ef8b635c51cf28bb16eb254c81598889a06ea,8d03e10212f5bfceda1b85b12135016765874ea3..9dfb4b2b16c904ebadb01002ddef0f0c78efc8e7
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -497,7 -497,8 +497,8 @@@
  #define PCI_DEVICE_ID_AMD_8111_SMBUS  0x746b
  #define PCI_DEVICE_ID_AMD_8111_AUDIO  0x746d
  #define PCI_DEVICE_ID_AMD_8151_0      0x7454
- #define PCI_DEVICE_ID_AMD_8131_APIC     0x7450
+ #define PCI_DEVICE_ID_AMD_8131_BRIDGE 0x7450
+ #define PCI_DEVICE_ID_AMD_8131_APIC   0x7451
  #define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090
  #define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
  #define PCI_DEVICE_ID_AMD_CS5536_AUDIO  0x2093
@@@ -930,7 -931,6 +931,7 @@@
  #define PCI_DEVICE_ID_PLX_DJINN_ITOO  0x1151
  #define PCI_DEVICE_ID_PLX_R753                0x1152
  #define PCI_DEVICE_ID_PLX_OLITEC      0x1187
 +#define PCI_DEVICE_ID_PLX_PCI200SYN   0x3196
  #define PCI_DEVICE_ID_PLX_9050                0x9050
  #define PCI_DEVICE_ID_PLX_9080                0x9080
  #define PCI_DEVICE_ID_PLX_GTEK_SERIAL2        0xa001