From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 18 Dec 2013 21:04:29 +0000 (-0700)
Subject: Merge branch 'pci/pciehp' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a737f76baee3d44cb25285986812e9cd97fd6002;p=deliverable%2Flinux.git

Merge branch 'pci/pciehp' into next

* pci/pciehp:
  PCI: pciehp: Move Attention & Power Indicator support tests to accessors
  PCI: pciehp: Use symbolic constants for Slot Control fields
  PCI: pciehp: Use symbolic constants, not hard-coded bitmask
  PCI: pciehp: Simplify "Power Fault Detected" checking/clearing
  PCI: pciehp: Announce slot capabilities (slot #, button, LEDs, etc)
  PCI: pciehp: Make various functions void since they can't fail
  PCI: pciehp: Remove error checks when accessing PCIe Capability
  PCI: pciehp: Drop pciehp_readw()/pciehp_writew() wrappers
---

a737f76baee3d44cb25285986812e9cd97fd6002