Merge branch 'pci/aspm'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Aug 2018 19:58:46 +0000 (14:58 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Aug 2018 19:58:46 +0000 (14:58 -0500)
commit187dacce194216c4d86c2afd0ca490a6d7fbb981
tree297a6df9c6e4744fe8f3f0092081f5994e667da8
parent3c3ab37f4c03dc9c7c917ff3c1e71d6da81d3bd3
parentce29af2a505627cc8f1deddb84bcbaf186b0bfd5
Merge branch 'pci/aspm'

  - Use sysfs_match_string() to simplify ASPM sysfs parsing (Andy
    Shevchenko)

  - Remove unnecessary includes of <linux/pci-aspm.h> (Bjorn Helgaas)

* pci/aspm:
  PCI: Remove unnecessary include of <linux/pci-aspm.h>
  iwlwifi: Remove unnecessary include of <linux/pci-aspm.h>
  ath9k: Remove unnecessary include of <linux/pci-aspm.h>
  igb: Remove unnecessary include of <linux/pci-aspm.h>
  PCI/ASPM: Convert to use sysfs_match_string() helper
drivers/pci/pci-sysfs.c
drivers/pci/pci.c
drivers/pci/probe.c
drivers/pci/remove.c