Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

Pull x86 platform driver updates from Matthew Garrett:
 "Some significant updates to samsung-laptop, additional hardware
  support for Toshibas, misc updates to various hardware and a new
  backlight driver for some Apple machines."

Fix up trivial conflicts: geode Geos update happening next to net5501
support, and MSIC thermal platform support added twice.

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (77 commits)
  acer-wmi: add quirk table for video backlight vendor mode
  drivers/platform/x86/amilo-rfkill.c::amilo_rfkill_probe() avoid NULL deref
  samsung-laptop: unregister ACPI video module for some well known laptops
  acer-wmi: No wifi rfkill on Sony machines
  thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS
  asus-wmi: don't update power and brightness when using scalar
  eeepc-wmi: split et2012 specific hacks
  eeepc-wmi: refine quirks handling
  asus-nb-wmi: set panel_power correctly
  asus-wmi: move WAPF variable into quirks_entry
  asus-wmi: store backlight power status for AIO machine
  asus-wmi: add scalar board brightness adj. support
  samsung-laptop: cleanup return type: mode_t vs umode_t
  drivers, samsung-laptop: fix usage of isalnum
  drivers, samsung-laptop: fix initialization of sabi_data in sabi_set_commandb
  asus-wmi: on/off bit is not set when reading the value
  eeepc-wmi: add extra keymaps for EP121
  asus-nb-wmi: ignore useless keys
  acer-wmi: support Lenovo ideapad S205 Brazos wifi switch
  acer-wmi: fix out of input parameter size when set
  ...

diff --cc Documentation/ABI/testing/sysfs-driver-samsung-laptop
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
index 90195235596943ff7fbb3b87a695eca988c5c9b8,3a38c4c1d359d5813c143e9d6b2319087a9dc449..3ad653de7100014100f91705f5dfb820bf433152
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2119,12 -2133,13 +2119,19 @@@ config ALI
  
          Note: You have to set alix.force=1 for boards with Award BIOS.
  
 +config NET5501
 +      bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)"
 +      select GPIOLIB
 +      ---help---
 +        This option enables system support for the Soekris Engineering net5501.
 +
+ config GEOS
+       bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"
+       select GPIOLIB
+       depends on DMI
+       ---help---
+         This option enables system support for the Traverse Technologies GEOS.
+ 
  endif # X86_32
  
  config AMD_NB

diff --cc arch/x86/platform/geode/Makefile
index 246b788847ff727dd7fcca9d120e77ba56fe23a6,d8ba5644f2f6c6c853adbc3ec35ede2d19b2be8e..5b51194f4c8d1569d57155f134abfd7204efdb48
--- 1/arch/x86/platform/geode/Makefile
--- 2/arch/x86/platform/geode/Makefile
+++ b/arch/x86/platform/geode/Makefile
@@@ -1,2 -1,2 +1,3 @@@
  obj-$(CONFIG_ALIX)            += alix.o
 +obj-$(CONFIG_NET5501)         += net5501.o
+ obj-$(CONFIG_GEOS)            += geos.o

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

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

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