linux-next: manual merge of the acpi tree with Linus' tree

Hi Len, Today's linux-next merge of the acpi tree got a conflict in include/acpi/acpixf.h between commit d8dc91b753b8 ("Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux") from Linus' tree and commit 558dc6f9ee2a ("Merge branch 'upstream' into next") from the acpi

linux-next: manual merge of the acpi tree with Linus' tree

Hi Len, Today's linux-next merge of the acpi tree got a conflict in include/acpi/acpixf.h between commit d8dc91b753b8 (Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux) from Linus' tree and commit 558dc6f9ee2a (Merge branch 'upstream' into next) from the acpi

linux-next: manual merge of the acpi tree with Linus' tree

Hi Len, Today's linux-next merge of the acpi tree got a conflict in include/acpi/acpixf.h between commit a1ce39288e6f ("UAPI: (Scripted) Convert #include "..." to #include in kernel system headers") from Linus' tree and commit be030a576854 ("ACPICA: Add support for complex _PLD buffers") from

linux-next: manual merge of the acpi tree with Linus' tree

Hi Len, Today's linux-next merge of the acpi tree got a conflict in include/acpi/acpixf.h between commit a1ce39288e6f (UAPI: (Scripted) Convert #include ... to #include path/... in kernel system headers) from Linus' tree and commit be030a576854 (ACPICA: Add support for complex _PLD buffers) from