Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Pull thermal managament updates from Zhang Rui:
 "Specifics:

   - Abstract the code and introduce helper functions for all int340x
     thermal drivers.  From: Srinivas Pandruvada.

   - Reorganize the ACPI LPAT table support code so that it can be
     shared for both ACPI PMIC driver and int340x thermal driver.

   - Add support for Braswell in intel_soc_dts thermal driver.

   - a couple of small fixes/cleanups for step_wise governor and int340x
     thermal driver"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  Thermal/int340x_thermal: remove unused uuids.
  thermal: step_wise: spelling fixes
  thermal: int340x: fix sparse warning
  Thermal/int340x: LPAT conversion for temperature
  ACPI / PMIC: Use common LPAT table handling functions
  ACPI / LPAT: Common table processing functions
  thermal: Intel SoC DTS: Add Braswell support
  Thermal/int340x/int3402: Provide notification support
  Thermal/int340x/processor_thermal: Add thermal zone support
  Thermal/int340x/int3403: Use int340x thermal API
  Thermal/int340x/int3402: Use int340x thermal API
  Thermal/int340x: Add common thermal zone handler

diff --combined drivers/acpi/Makefile
index b18cd2151ddb244e1961c48165ab973d88880d71,d22253d5b9f897805b1100e4fb09684a8d16dd5f..623b117ad1a23ee09ac7aca1ca5d028b51ec2738
--- 1/drivers/acpi/Makefile
--- 2/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@@ -40,7 -40,7 +40,7 @@@ acpi-$(CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC
  acpi-y                                += ec.o
  acpi-$(CONFIG_ACPI_DOCK)      += dock.o
  acpi-y                                += pci_root.o pci_link.o pci_irq.o
 -acpi-y                                += acpi_lpss.o
 +acpi-y                                += acpi_lpss.o acpi_apd.o
  acpi-y                                += acpi_platform.o
  acpi-y                                += acpi_pnp.o
  acpi-y                                += int340x_thermal.o
@@@ -55,6 -55,7 +55,7 @@@ acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_
  ifdef CONFIG_ACPI_VIDEO
  acpi-y                                += video_detect.o
  endif
+ acpi-y                                += acpi_lpat.o
  
  # These are (potentially) separate modules
  
@@@ -70,7 -71,6 +71,7 @@@ obj-$(CONFIG_ACPI_PROCESSOR)  += process
  obj-y                         += container.o
  obj-$(CONFIG_ACPI_THERMAL)    += thermal.o
  obj-y                         += acpi_memhotplug.o
 +obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o
  obj-$(CONFIG_ACPI_BATTERY)    += battery.o
  obj-$(CONFIG_ACPI_SBS)                += sbshc.o
  obj-$(CONFIG_ACPI_SBS)                += sbs.o