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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_fsl,mv,nv: prepare for NCQ command completion update
  ata: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)
  libata: more PCI IDs for jmicron controllers
  ata_piix: fix locking around SIDPR access
  [libata] update blacklist for new hyphenated pattern ranges (v2)
  libata: allow hyphenated pattern ranges
  ata_generic: drop hard coded DMA force logic for CENATEK
  [libata] ahci: Fix warning: comparison between 'enum <anonymous>' and 'enum <anonymous>'
  [libata] add ATA_CMD_DSM to ata_get_cmd_descript
  [libata] Add Samsung PATA controller driver, pata_samsung_cf
  [libata] Add 460EX on-chip SATA driver, sata_dwc_460ex
  libata: reduce blacklist size even more (v2)
  libata: reduce blacklist size (v2)
  libata: glob_match for ata_device_blacklist (v2)
  ahci_platform: Remove unneeded ahci_driver.probe assignment
  ahci_platform: Provide for vendor specific init

diff --combined include/linux/pci_ids.h
index 40c804d484ca54cf2856c35713e6639ffc11c6f2,eb200e6beb65d695a0626ee1e431f155c6f27fc8..c81eec4d3c35118090be667157c056d2b0661d27
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1494,9 -1494,6 +1494,9 @@@
  #define PCI_DEVICE_ID_SBE_WANXL100    0x0301
  #define PCI_DEVICE_ID_SBE_WANXL200    0x0302
  #define PCI_DEVICE_ID_SBE_WANXL400    0x0104
 +#define PCI_SUBDEVICE_ID_SBE_T3E3     0x0009
 +#define PCI_SUBDEVICE_ID_SBE_2T3E3_P0 0x0901
 +#define PCI_SUBDEVICE_ID_SBE_2T3E3_P1 0x0902
  
  #define PCI_VENDOR_ID_TOSHIBA         0x1179
  #define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1       0x0101
@@@ -2057,6 -2054,7 +2057,6 @@@
  #define PCI_DEVICE_ID_NX2_57711E      0x1650
  #define PCI_DEVICE_ID_TIGON3_5705     0x1653
  #define PCI_DEVICE_ID_TIGON3_5705_2   0x1654
 -#define PCI_DEVICE_ID_TIGON3_5720     0x1658
  #define PCI_DEVICE_ID_TIGON3_5721     0x1659
  #define PCI_DEVICE_ID_TIGON3_5722     0x165a
  #define PCI_DEVICE_ID_TIGON3_5723     0x165b
@@@ -2070,11 -2068,13 +2070,11 @@@
  #define PCI_DEVICE_ID_TIGON3_5754M    0x1672
  #define PCI_DEVICE_ID_TIGON3_5755M    0x1673
  #define PCI_DEVICE_ID_TIGON3_5756     0x1674
 -#define PCI_DEVICE_ID_TIGON3_5750     0x1676
  #define PCI_DEVICE_ID_TIGON3_5751     0x1677
  #define PCI_DEVICE_ID_TIGON3_5715     0x1678
  #define PCI_DEVICE_ID_TIGON3_5715S    0x1679
  #define PCI_DEVICE_ID_TIGON3_5754     0x167a
  #define PCI_DEVICE_ID_TIGON3_5755     0x167b
 -#define PCI_DEVICE_ID_TIGON3_5750M    0x167c
  #define PCI_DEVICE_ID_TIGON3_5751M    0x167d
  #define PCI_DEVICE_ID_TIGON3_5751F    0x167e
  #define PCI_DEVICE_ID_TIGON3_5787F    0x167f
@@@ -2264,7 -2264,6 +2264,7 @@@
  #define PCI_DEVICE_ID_TDI_EHCI          0x0101
  
  #define PCI_VENDOR_ID_FREESCALE               0x1957
 +#define PCI_DEVICE_ID_MPC8308         0xc006
  #define PCI_DEVICE_ID_MPC8315E                0x00b4
  #define PCI_DEVICE_ID_MPC8315         0x00b5
  #define PCI_DEVICE_ID_MPC8314E                0x00b6
@@@ -2325,9 -2324,11 +2325,11 @@@
  #define PCI_DEVICE_ID_JMICRON_JMB361  0x2361
  #define PCI_DEVICE_ID_JMICRON_JMB362  0x2362
  #define PCI_DEVICE_ID_JMICRON_JMB363  0x2363
+ #define PCI_DEVICE_ID_JMICRON_JMB364  0x2364
  #define PCI_DEVICE_ID_JMICRON_JMB365  0x2365
  #define PCI_DEVICE_ID_JMICRON_JMB366  0x2366
  #define PCI_DEVICE_ID_JMICRON_JMB368  0x2368
+ #define PCI_DEVICE_ID_JMICRON_JMB369  0x2369
  #define PCI_DEVICE_ID_JMICRON_JMB38X_SD       0x2381
  #define PCI_DEVICE_ID_JMICRON_JMB38X_MMC 0x2382
  #define PCI_DEVICE_ID_JMICRON_JMB38X_MS       0x2383
@@@ -2773,6 -2774,3 +2775,6 @@@
  #define PCI_DEVICE_ID_RME_DIGI32      0x9896
  #define PCI_DEVICE_ID_RME_DIGI32_PRO  0x9897
  #define PCI_DEVICE_ID_RME_DIGI32_8    0x9898
 +
 +#define PCI_VENDOR_ID_XEN             0x5853
 +#define PCI_DEVICE_ID_XEN_PLATFORM    0x0001