From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 7 Dec 2012 19:11:52 +0000 (-0700)
Subject: Merge branch 'pci/bjorn-pcie-cap' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=27e1c8ee0170e80f6426c35d54f3b5cd9dadb25b;p=linux-beck.git

Merge branch 'pci/bjorn-pcie-cap' into next

* pci/bjorn-pcie-cap:
  ath9k: Use standard #defines for PCIe Capability ASPM fields
  iwlwifi: Use standard #defines for PCIe Capability ASPM fields
  iwlwifi: collapse wrapper for pcie_capability_read_word()
  iwlegacy: Use standard #defines for PCIe Capability ASPM fields
  iwlegacy: collapse wrapper for pcie_capability_read_word()
  cxgb3: Use standard #defines for PCIe Capability ASPM fields
  PCI: Add standard PCIe Capability Link ASPM field names
  PCI/portdrv: Use PCI Express Capability accessors
  PCI: Use standard PCIe Capability Link register field names
  PCI: Add and use standard PCI-X Capability register names
---

27e1c8ee0170e80f6426c35d54f3b5cd9dadb25b