tree 720042f9a68e65c5e556483aa38b9c8d97e15206
parent b895e663f4ade8d8546bc57ea22b40e4bc993c6c
parent bfb09a86f5f60f9a83c676b53db8d9210549ee19
author Bjorn Helgaas <bhelgaas@google.com> 1347988078 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1347988078 -0600

Merge branch 'pci/konstantin-sysfs' into next

* pci/konstantin-sysfs:
  PCI: Convert "new_id"/"remove_id" into generic pci_bus driver attributes