]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
Merge branch 'pci/greg-m68k' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 13 Jul 2012 15:42:46 +0000 (09:42 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 13 Jul 2012 15:42:46 +0000 (09:42 -0600)
* pci/greg-m68k:
  PCI: build resource code for M68K architecture


Trivial merge