From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 9 Feb 2015 14:40:30 +0000 (+0100)
Subject: Merge branch 'pci/host-generic' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: fixes-v4.0-rc1~160^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c493df25a0d9e0c3bda742250ecfc5953bf4ccd;p=pandora-kernel.git

Merge branch 'pci/host-generic' of git://git./linux/kernel/git/helgaas/pci into acpi-resources

modified:   drivers/of/of_pci.c

This fixes a build failure after merging the 'acpi-resources' branch
with the PCI tree caused by bad interactions between that branch and
the only commit in 'pci/host-generic'.  Also that commit contains a
bug which can be fixed by removing one line of code, so do that too.

Link: http://marc.info/?l=linux-kernel&m=142344882101429&w=2
Link: http://marc.info/?l=linux-next&m=142346304003932&w=2
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

Reading git-diff-tree failed