Merge branch 'gpe-defer' into release

diff --cc drivers/acpi/acpica/acglobal.h
Simple merge

diff --cc drivers/acpi/acpica/aclocal.h
Simple merge

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

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

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc include/acpi/acpixf.h
Simple merge