Merge branch 'acpi-assorted-next' into linux-next

* acpi-assorted-next:
  ACPI / battery: Make sure all spaces are in correct places
  ACPI / ghes: Remove redundant platform_set_drvdata()
  ACPI: add _STA evaluation at do_acpi_find_child()
  ACPI / APEI: Add parameter check before error injection
  ACPI / LPSS: add support for Intel BayTrail
  ACPI / APEI: Update EINJ documentation for param1/param2
  xen / ACPI / sleep: Register an acpi_suspend_lowlevel callback.
  x86 / ACPI / sleep: Provide registration for acpi_suspend_lowlevel.
  ACPI / resources: call acpi_get_override_irq() only for legacy IRQ resources
  acpi: ec_sys: access user space with get_user()/put_user()

diff --cc drivers/acpi/apei/ghes.c
Simple merge

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