Merge commit 'origin/master' into next

diff --combined include/linux/pci_ids.h
index f988a0d686366a472301f45c7b2a71a0d936b2ad,84cf1f3b7838e70d30c8d010e0a964b82a2b785b..1b7f2a7939cb85abeb069637f6e4cc1fbcd360a9
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1956,6 -1956,8 +1956,8 @@@
  #define PCI_DEVICE_ID_LAVA_DSERIAL    0x0100 /* 2x 16550 */
  #define PCI_DEVICE_ID_LAVA_QUATRO_A   0x0101 /* 2x 16550, half of 4 port */
  #define PCI_DEVICE_ID_LAVA_QUATRO_B   0x0102 /* 2x 16550, half of 4 port */
+ #define PCI_DEVICE_ID_LAVA_QUATTRO_A  0x0120 /* 2x 16550A, half of 4 port */
+ #define PCI_DEVICE_ID_LAVA_QUATTRO_B  0x0121 /* 2x 16550A, half of 4 port */
  #define PCI_DEVICE_ID_LAVA_OCTO_A     0x0180 /* 4x 16550A, half of 8 port */
  #define PCI_DEVICE_ID_LAVA_OCTO_B     0x0181 /* 4x 16550A, half of 8 port */
  #define PCI_DEVICE_ID_LAVA_PORT_PLUS  0x0200 /* 2x 16650 */
@@@ -2288,20 -2290,6 +2290,20 @@@
  #define PCI_DEVICE_ID_MPC8536         0x0051
  #define PCI_DEVICE_ID_P2020E          0x0070
  #define PCI_DEVICE_ID_P2020           0x0071
 +#define PCI_DEVICE_ID_P2010E          0x0078
 +#define PCI_DEVICE_ID_P2010           0x0079
 +#define PCI_DEVICE_ID_P1020E          0x0100
 +#define PCI_DEVICE_ID_P1020           0x0101
 +#define PCI_DEVICE_ID_P1011E          0x0108
 +#define PCI_DEVICE_ID_P1011           0x0109
 +#define PCI_DEVICE_ID_P1022E          0x0110
 +#define PCI_DEVICE_ID_P1022           0x0111
 +#define PCI_DEVICE_ID_P1013E          0x0118
 +#define PCI_DEVICE_ID_P1013           0x0119
 +#define PCI_DEVICE_ID_P4080E          0x0400
 +#define PCI_DEVICE_ID_P4080           0x0401
 +#define PCI_DEVICE_ID_P4040E          0x0408
 +#define PCI_DEVICE_ID_P4040           0x0409
  #define PCI_DEVICE_ID_MPC8641         0x7010
  #define PCI_DEVICE_ID_MPC8641D                0x7011
  #define PCI_DEVICE_ID_MPC8610         0x7018