ACPICA: Linuxize: Reduce divergences for 20150616 release

This patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20150616 release can be
applied with reduced human intervention.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --cc drivers/acpi/acpica/dsobject.c
Simple merge

diff --cc drivers/acpi/acpica/hwxfsleep.c
Simple merge

diff --cc drivers/acpi/acpica/rscreate.c
Simple merge

diff --cc drivers/acpi/acpica/rsutils.c
Simple merge

diff --cc drivers/acpi/acpica/tbxface.c
Simple merge

diff --cc include/acpi/platform/acenv.h
Simple merge