Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --combined include/linux/pci_ids.h
index c6bcfe93b9cab9deeab76844ce8b76e2a2adf5bb,f29c25ede70d31f669acda5ae8d2af5c6d9a691a..32bd569496049f138b0e23c276fd8849982e935c
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -767,8 -767,6 +767,8 @@@
  #define PCI_DEVICE_ID_ELSA_MICROLINK  0x1000
  #define PCI_DEVICE_ID_ELSA_QS3000     0x3000
  
 +#define PCI_VENDOR_ID_STMICRO         0x104A
 +
  #define PCI_VENDOR_ID_BUSLOGIC                      0x104B
  #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140
  #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER    0x1040
@@@ -1253,8 -1251,6 +1253,8 @@@
  #define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO5700_2    0x0348
  #define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_GO1000       0x034C
  #define PCI_DEVICE_ID_NVIDIA_QUADRO_FX_1100         0x034E
 +#define PCI_DEVICE_ID_NVIDIA_MCP55_BRIDGE_V0      0x0360
 +#define PCI_DEVICE_ID_NVIDIA_MCP55_BRIDGE_V4      0x0364
  #define PCI_DEVICE_ID_NVIDIA_NVENET_15              0x0373
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA      0x03E7
  #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SMBUS           0x03EB
@@@ -2047,6 -2043,7 +2047,7 @@@
  #define PCI_DEVICE_ID_AFAVLAB_P030    0x2182
  #define PCI_SUBDEVICE_ID_AFAVLAB_P061         0x2150
  
+ #define PCI_VENDOR_ID_BCM_GVC          0x14a4
  #define PCI_VENDOR_ID_BROADCOM                0x14e4
  #define PCI_DEVICE_ID_TIGON3_5752     0x1600
  #define PCI_DEVICE_ID_TIGON3_5752M    0x1601
@@@ -2272,13 -2269,6 +2273,13 @@@
  
  #define PCI_VENDOR_ID_SILAN           0x1904
  
 +#define PCI_VENDOR_ID_RENESAS         0x1912
 +#define PCI_DEVICE_ID_RENESAS_SH7781  0x0001
 +#define PCI_DEVICE_ID_RENESAS_SH7780  0x0002
 +#define PCI_DEVICE_ID_RENESAS_SH7763  0x0004
 +#define PCI_DEVICE_ID_RENESAS_SH7785  0x0007
 +#define PCI_DEVICE_ID_RENESAS_SH7786  0x0010
 +
  #define PCI_VENDOR_ID_TDI               0x192E
  #define PCI_DEVICE_ID_TDI_EHCI          0x0101
  
@@@ -2434,13 -2424,6 +2435,13 @@@
  #define PCI_DEVICE_ID_INTEL_82375     0x0482
  #define PCI_DEVICE_ID_INTEL_82424     0x0483
  #define PCI_DEVICE_ID_INTEL_82378     0x0484
 +#define PCI_DEVICE_ID_INTEL_MRST_SD0  0x0807
 +#define PCI_DEVICE_ID_INTEL_MRST_SD1  0x0808
 +#define PCI_DEVICE_ID_INTEL_MFD_SD    0x0820
 +#define PCI_DEVICE_ID_INTEL_MFD_SDIO1 0x0821
 +#define PCI_DEVICE_ID_INTEL_MFD_SDIO2 0x0822
 +#define PCI_DEVICE_ID_INTEL_MFD_EMMC0 0x0823
 +#define PCI_DEVICE_ID_INTEL_MFD_EMMC1 0x0824
  #define PCI_DEVICE_ID_INTEL_I960      0x0960
  #define PCI_DEVICE_ID_INTEL_I960RM    0x0962
  #define PCI_DEVICE_ID_INTEL_8257X_SOL 0x1062
@@@ -2462,11 -2445,9 +2463,11 @@@
  #define PCI_DEVICE_ID_INTEL_82840_HB  0x1a21
  #define PCI_DEVICE_ID_INTEL_82845_HB  0x1a30
  #define PCI_DEVICE_ID_INTEL_IOAT      0x1a38
 -#define PCI_DEVICE_ID_INTEL_CPT_SMBUS 0x1c22
 -#define PCI_DEVICE_ID_INTEL_CPT_LPC_MIN       0x1c41
 -#define PCI_DEVICE_ID_INTEL_CPT_LPC_MAX       0x1c5f
 +#define PCI_DEVICE_ID_INTEL_COUGARPOINT_SMBUS 0x1c22
 +#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN       0x1c41
 +#define PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX       0x1c5f
 +#define PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS    0x1d22
 +#define PCI_DEVICE_ID_INTEL_PATSBURG_LPC      0x1d40
  #define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
  #define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411
  #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413
@@@ -2675,9 -2656,9 +2676,9 @@@
  #define PCI_DEVICE_ID_INTEL_ICH10_3   0x3a1a
  #define PCI_DEVICE_ID_INTEL_ICH10_4   0x3a30
  #define PCI_DEVICE_ID_INTEL_ICH10_5   0x3a60
 -#define PCI_DEVICE_ID_INTEL_PCH_LPC_MIN       0x3b00
 -#define PCI_DEVICE_ID_INTEL_PCH_LPC_MAX       0x3b1f
 -#define PCI_DEVICE_ID_INTEL_PCH_SMBUS 0x3b30
 +#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MIN     0x3b00
 +#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_LPC_MAX     0x3b1f
 +#define PCI_DEVICE_ID_INTEL_5_3400_SERIES_SMBUS       0x3b30
  #define PCI_DEVICE_ID_INTEL_IOAT_SNB  0x402f
  #define PCI_DEVICE_ID_INTEL_5100_16   0x65f0
  #define PCI_DEVICE_ID_INTEL_5100_21   0x65f5
@@@ -2686,8 -2667,8 +2687,8 @@@
  #define PCI_DEVICE_ID_INTEL_5400_FBD0 0x4035
  #define PCI_DEVICE_ID_INTEL_5400_FBD1 0x4036
  #define PCI_DEVICE_ID_INTEL_IOAT_SCNB 0x65ff
 -#define PCI_DEVICE_ID_INTEL_TOLAPAI_0 0x5031
 -#define PCI_DEVICE_ID_INTEL_TOLAPAI_1 0x5032
 +#define PCI_DEVICE_ID_INTEL_EP80579_0 0x5031
 +#define PCI_DEVICE_ID_INTEL_EP80579_1 0x5032
  #define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
  #define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
  #define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020