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)
commitcb8e92d8e4d9f8562071b6ab39e1b837e9e7af39
treed9cc510c0d6c396d803cd10bf56b681072084c41
parent66e5bde9e5f9a4007be107c2926f96ec9b2b0010
parentf0b66a2cf68ed3613fe72fe01ed309f998e2bbb3
Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
include/linux/pci.h