Merge branch 'pci/feng-avoid-kmalloc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 10 Sep 2012 22:31:08 +0000 (16:31 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 10 Sep 2012 22:31:08 +0000 (16:31 -0600)
* pci/feng-avoid-kmalloc:
  PCI: Remove the obsolete no_pci_devices() check
  PCI: Use pci_device_id on stack for pci_get_subsys/class() to avoid kmalloc

1  2 
drivers/pci/search.c

Simple merge