Merge branch 'pci/greg-m68k' into next

* pci/greg-m68k:
  PCI: build resource code for M68K architecture
This commit is contained in:
Bjorn Helgaas 2012-07-13 09:42:46 -06:00
commit cfeeb34bc0