Merge branch 'fixes' into for-next

Merge fixes back into for-next to be able to take dell_rbu change that
is build on top of fixes material, and to bring lenovo related changes
in sync after the move under lenovo/ subdir in the for-next branch and
diverging changes in the fixes branch.

diff --cc MAINTAINERS
index c14614613377df7f40565c6df50661fe3f510034,e8f3dc93a56921924f57e7d5a03ea2fa182a4448..2da44049e9e0d510fee132961f0cdf96d4b26a6d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -13681,10 -13675,10 +13681,10 @@@ LENOVO WMI HOTKEY UTILITIES DRIVE
  M:    Jackie Dong <xy-jackie@139.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
 -F:    drivers/platform/x86/lenovo-wmi-hotkey-utilities.c
 +F:    drivers/platform/x86/lenovo/wmi-hotkey-utilities.c
  
  LETSKETCH HID TABLET DRIVER
- M:    Hans de Goede <hdegoede@redhat.com>
+ M:    Hans de Goede <hansg@kernel.org>
  L:    linux-input@vger.kernel.org
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git

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/think-lmi.c
Simple merge

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

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