Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Sat, 7 Feb 2015 14:22:24 +0000 (08:22 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 7 Feb 2015 14:22:24 +0000 (08:22 -0600)
* pci/misc:
  PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF

1  2 
include/linux/pci.h

Simple merge