From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 30 May 2014 17:40:13 +0000 (-0600)
Subject: Merge branch 'pci/host-generic' into next
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~38^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d785260e2f57d87de5c059de2dabc3cd31b745f0;p=pandora-kernel.git

Merge branch 'pci/host-generic' into next

* pci/host-generic:
  MAINTAINERS: Add generic PCI host controller driver
  PCI: generic: Add generic PCI host controller driver

Conflicts:
	drivers/pci/host/Kconfig
	drivers/pci/host/Makefile
---

d785260e2f57d87de5c059de2dabc3cd31b745f0
Reading git-diff-tree failed