From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 3 Jun 2014 21:10:06 +0000 (+0200)
Subject: Merge branches 'acpi-tables' and 'acpi-general'
X-Git-Tag: v3.16-rc1~30^2~5^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91ab377ba3ab202c40a0da402d6c2f1507a15355;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'acpi-tables' and 'acpi-general'

* acpi-tables:
  ACPI: Fix conflict between customized DSDT and DSDT local copy

* acpi-general:
  ACPI: Add acpi_bus_attach_private_data() to attach data to ACPI handle
---

91ab377ba3ab202c40a0da402d6c2f1507a15355