From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 13 Jul 2012 15:42:46 +0000 (-0600)
Subject: Merge branch 'pci/greg-m68k' into next
X-Git-Tag: for-3.6~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cfeeb34bc04648a61840e5376925cf9094da5ea6;p=users%2Fdwmw2%2Flinux.git

Merge branch 'pci/greg-m68k' into next

* pci/greg-m68k:
  PCI: build resource code for M68K architecture
---

cfeeb34bc04648a61840e5376925cf9094da5ea6