| commit | f36c493491df1c83d6fee03433dd9ceaf2563e8b | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Thu Oct 31 13:50:08 2013 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Thu Oct 31 13:50:08 2013 -0600 |
| tree | c6f505d1ef469efdad9d19bf9c22f7ac70cfae2d | |
| parent | 605d240052473228bf0c8c051cad825fddb25502 [diff] | |
| parent | bf22c90fb190e837173d61368e3c80f5b78751a8 [diff] |
Merge branch 'pci/gregkh-driver-core' into next * pci/gregkh-driver-core: PCI: Make pci_bus_attrs, pci_dev_attrs, dev_rescan_attr, dev_remove_attr, vga_attr static PCI: convert bus code to use dev_groups PCI: convert bus code to use drv_groups PCI: convert bus code to use bus_groups