git.stricted.de - GitHub/mt8127/android_kernel_alcatel

author	Lv Zheng <lv.zheng@intel.com>
	Mon, 12 May 2014 07:50:16 +0000 (15:50 +0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 1 Jul 2014 03:09:44 +0000 (20:09 -0700)
commit	8df7e87020a3cc441ccb30ee0eb29f0eb4212733
tree	12600f73e5c8cc9bea4dc7024187543a38286112	tree \| snapshot (tar.gz zip)
parent	5e43bc687fbbd009b7dfd2c0eb73ca6e3dd6cf85	commit \| diff

ACPI: Fix conflict between customized DSDT and DSDT local copy

commit 73577d1df8e1f31f6b1a5eebcdbc334eb0330e47 upstream.

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>
[rjw: Subject]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>