Merge branch 'acpi-driver' into linux-next
* acpi-driver:
ACPI: thermal: Rework system suspend and resume handling
ACPI: thermal: Convert the driver to a platform one
ACPI: thermal: Adjust event notification routine
ACPI: scan: Register platform devices for thermal zones
ACPI: scan: Do not mark button ACPI devices as wakeup-capable
ACPI: scan: Do not bind ACPI drivers to fixed event buttons
ACPI: tiny-power-button: Convert the driver to a platform one
ACPI: button: Convert the driver to a platform one
ACPI: button: Adjust event notification routines
ACPI: scan: Reduce code duplication related to fixed event devices
ACPI: scan: Register platform devices for fixed event buttons
ACPI: NFIT: core: Convert the driver to a platform one
