• Linus Torvalds's avatar
    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 132a4edb
    Linus Torvalds authored
    * '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
    132a4edb
pci_ids.h 107 KB