From 5c493df25a0d9e0c3bda742250ecfc5953bf4ccd Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 9 Feb 2015 15:40:30 +0100 Subject: [PATCH] Merge branch 'pci/host-generic' of git://git.kernel.org/pub/scm/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 --- Reading git-format-patch failed