Merge branch 'fixes' into 'for-next'

Merge the fixes branch into the for-next branch to resolve Makefile
conflict and include the power supply accessor work that is required
by the upcoming Uniwill driver.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/platform/x86/Makefile
index 0530a224bebd5c08bb8aedd3e9058484acc7d4f5,bea87a85ae75a307bc9c3e0309d3d8d32be42650..a0c5848513e38dfa02ebffc33c7b04c5483ad6a2
--- 1/drivers/platform/x86/Makefile
--- 2/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@@ -58,12 -58,19 +58,14 @@@ obj-$(CONFIG_X86_PLATFORM_DRIVERS_HP)      +
  # Hewlett Packard Enterprise
  obj-$(CONFIG_UV_SYSFS)       += uv_sysfs.o
  
 -# IBM Thinkpad and Lenovo
+ obj-$(CONFIG_FW_ATTR_CLASS)   += firmware_attributes_class.o
+ 
 +# IBM Thinkpad (before 2005)
  obj-$(CONFIG_IBM_RTL)         += ibm_rtl.o
 -obj-$(CONFIG_IDEAPAD_LAPTOP)  += ideapad-laptop.o
 -obj-$(CONFIG_LENOVO_WMI_HOTKEY_UTILITIES)     += lenovo-wmi-hotkey-utilities.o
 -obj-$(CONFIG_LENOVO_YMC)      += lenovo-ymc.o
  obj-$(CONFIG_SENSORS_HDAPS)   += hdaps.o
 -obj-$(CONFIG_THINKPAD_ACPI)   += thinkpad_acpi.o
 -obj-$(CONFIG_THINKPAD_LMI)    += think-lmi.o
 -obj-$(CONFIG_YOGABOOK)                += lenovo-yogabook.o
 -obj-$(CONFIG_YT2_1380)                += lenovo-yoga-tab2-pro-1380-fastcharger.o
 -obj-$(CONFIG_LENOVO_WMI_CAMERA)       += lenovo-wmi-camera.o
 +
 +# Lenovo
 +obj-y                         += lenovo/
  
  # Intel
  obj-y                         += intel/

diff --cc drivers/platform/x86/dell/alienware-wmi-wmax.c
Simple merge

diff --cc drivers/platform/x86/lenovo/ideapad-laptop.c
Simple merge

diff --cc drivers/platform/x86/lenovo/wmi-hotkey-utilities.c
Simple merge