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

* acpi-assorted-next:
  ACPI: Do not fail acpi_bind_one() if device is already bound correctly
  ACPI: Move acpi_bus_get_device() from bus.c to scan.c
  ACPI / scan: Allow platform device creation without any IO resources
  ACPI / PCI: acpi_pci_irq_enable() must return an error if ACPI cannot map an IRQ.
  ACPI: Cleanup sparse warning on acpi_os_initialize1()
  platform / thinkpad: Remove deprecated hotkey_report_mode parameter
  ACPI: Remove the old /proc/acpi/event interface

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

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

diff --cc drivers/acpi/internal.h
Simple merge

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

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

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

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

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

diff --cc drivers/pci/hotplug/acpiphp_ibm.c
Simple merge

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