From: Lv Zheng <lv.zheng@intel.com>
Date: Mon, 12 May 2014 07:50:16 +0000 (+0800)
Subject: ACPI: Fix conflict between customized DSDT and DSDT local copy
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~5^2~15^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73577d1df8e1f31f6b1a5eebcdbc334eb0330e47;p=pandora-kernel.git

ACPI: Fix conflict between customized DSDT and DSDT local copy

This patch fixes the following issue:
If DSDT is customized, no local DSDT copy is needed.

References: https://bugzilla.kernel.org/show_bug.cgi?id=69711
Signed-off-by: Enrico Etxe Arte <goitizena.generoa@gmail.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Cc: 2.6.35+ <stable@vger.kernel.org> # 2.6.35+
[rjw: Subject]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

Reading git-diff-tree failed