Merge branch 'pci/konstantin-sysfs' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 18 Sep 2012 17:07:58 +0000 (11:07 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 18 Sep 2012 17:07:58 +0000 (11:07 -0600)
commit8704936a70586cc0834ddf35760cd0fe4b65131e
tree720042f9a68e65c5e556483aa38b9c8d97e15206
parentb895e663f4ade8d8546bc57ea22b40e4bc993c6c
parentbfb09a86f5f60f9a83c676b53db8d9210549ee19
Merge branch 'pci/konstantin-sysfs' into next

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