diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-09 15:40:30 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-09 23:32:19 +0100 |
| commit | 5c493df25a0d9e0c3bda742250ecfc5953bf4ccd (patch) | |
| tree | 55044f5a616c8d71cc957e1e713ffb97029ffe9b /arch/arm/kernel | |
| parent | c183619b63ec934110e3a173a34b414e26869f96 (diff) | |
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 <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/arm/kernel')
0 files changed, 0 insertions, 0 deletions