From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 20 Nov 2015 00:22:52 +0000 (+0100)
Subject: Merge branches 'acpi-smbus', 'acpi-ec' and 'acpi-pci'
X-Git-Tag: v4.14-rc1~4280^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a3767e3c9da514e63e898772b72b932f9eb3b062;p=platform%2Fkernel%2Flinux-rpi.git

Merge branches 'acpi-smbus', 'acpi-ec' and 'acpi-pci'

* acpi-smbus:
  Revert "ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook"
  ACPI / SMBus: Fix boot stalls / high CPU caused by reentrant code

* acpi-ec:
  ACPI-EC: Drop unnecessary check made before calling acpi_ec_delete_query()

* acpi-pci:
  PCI: Fix OF logic in pci_dma_configure()
---

a3767e3c9da514e63e898772b72b932f9eb3b062