Merge branch 'pci/host-layerscape' into next

Browse source

* pci/host-layerscape:
  PCI: layerscape: Use of_device_get_match_data() to simplify probe

Conflicts:
	drivers/pci/dwc/pci-layerscape.c

...

This commit is contained in:

Bjorn Helgaas 2017-02-21 15:15:21 -06:00

parent 68094b4b8d 6dc2c04fd9

commit e2dc4f225b

1 changed files with 1 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

drivers/pci/dwc/pci-layerscape.c

View file