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)
commit2c1f56acb2ddf3aa273b14ebd48d61b930777e52
treee6f987756470014a0df9253bb220aebeb117d1f4
parentbe017b255eca3db94f6f62f20d05abc6bffab7ee
parente9bf1040f649d89db3c2e060d1b0b56665a4fb93
Merge branch 'pci/feng-avoid-kmalloc' into next

* 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
drivers/pci/search.c