tree c1eeed2abdf258cb6cf2d14f5986c2e9bed40a1e
parent d3c02799d32039ddd548c20680f7982b646ba3d8
parent 09a2c73ddfc7f173237fc7209a65b34dd5bcb5ed
author Bjorn Helgaas <bhelgaas@google.com> 1380321343 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1380321343 -0600

Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition
  PCI: acpiphp_ibm: Convert to dynamic debug
  PCI: acpiphp: Convert to dynamic debug
  PCI: Remove Intel Haswell D3 delays
  PCI: Pass type, width, and prefetchability for window alignment
  PCI: Document reason for using pci_is_root_bus()
  PCI: Use pci_is_root_bus() to check for root bus
  PCI: Remove unused "is_pcie" from pci_dev structure
  PCI: Update pci_find_slot() description in pci.txt
  [SCSI] qla2xxx: Use standard PCIe Capability Link register field names
  PCI: Fix comment typo, remove unnecessary !! in pci_is_pcie()
  PCI: Drop "setting latency timer" messages