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
  ...

1 files changed, 18 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-driver-samsung-laptop b/Documentation/ABI/testing/sysfs-driver-samsung-laptop
index e82e7c2b8f80..678819a3f8bf 100644
--- a/Documentation/ABI/testing/sysfs-driver-samsung-laptop
+++ b/Documentation/ABI/testing/sysfs-driver-samsung-laptop
@@ -17,3 +17,21 @@ Description:	Some Samsung laptops have different "performance levels"
                 Specifically, not all support the "overclock" option,
                 and it's still unknown if this value even changes
                 anything, other than making the user feel a bit better.
+
+What:           /sys/devices/platform/samsung/battery_life_extender
+Date:           December 1, 2011
+KernelVersion:  3.3
+Contact:        Corentin Chary <corentin.chary@gmail.com>
+Description:    Max battery charge level can be modified, battery cycle
+                life can be extended by reducing the max battery charge
+                level.
+                0 means normal battery mode (100% charge)
+                1 means battery life extender mode (80% charge)
+
+What:           /sys/devices/platform/samsung/usb_charge
+Date:           December 1, 2011
+KernelVersion:  3.3
+Contact:        Corentin Chary <corentin.chary@gmail.com>
+Description:    Use your USB ports to charge devices, even
+                when your laptop is powered off.
+                1 means enabled, 0 means disabled.