Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (38 commits)
  acer-wmi: support Lenovo ideapad S205 wifi switch
  acerhdf.c: spaces in aliased changed to *
  platform-drivers-x86: ideapad-laptop: add missing ideapad_input_exit in ideapad_acpi_add error path
  x86 driver: fix typo in TDP override enabling
  Platform: fix samsung-laptop DMI identification for N150/N210/220/N230
  dell-wmi: Add keys for Dell XPS L502X
  platform-drivers-x86: samsung-q10: make dmi_check_callback return 1
  Platform: Samsung Q10 backlight driver
  platform-drivers-x86: intel_scu_ipc: convert to DEFINE_PCI_DEVICE_TABLE
  platform-drivers-x86: intel_rar_register: convert to DEFINE_PCI_DEVICE_TABLE
  platform-drivers-x86: intel_menlow: add missing return AE_OK for intel_menlow_register_sensor()
  platform-drivers-x86: intel_mid_thermal: fix memory leak
  platform-drivers-x86: msi-wmi: add missing sparse_keymap_free in msi_wmi_init error path
  Samsung Laptop platform driver: support N510
  asus-wmi: add uwb rfkill support
  asus-wmi: add gps rfkill support
  asus-wmi: add CWAP support and clarify the meaning of WAPF bits
  asus-wmi: return proper value in store_cpufv()
  asus-wmi: check for temp1 presence
  asus-wmi: add thermal sensor
  ...

2 files changed, 28 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-platform-ideapad-laptop b/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
index 807fca2ae2a4..ff53183c3848 100644
--- a/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
+++ b/Documentation/ABI/testing/sysfs-platform-ideapad-laptop
@@ -4,3 +4,20 @@ KernelVersion:	2.6.37
 Contact:        "Ike Panhc <ike.pan@canonical.com>"
 Description:
                 Control the power of camera module. 1 means on, 0 means off.
+
+What:           /sys/devices/platform/ideapad/cfg
+Date:           Jun 2011
+KernelVersion:  3.1
+Contact:        "Ike Panhc <ike.pan@canonical.com>"
+Description:
+                Ideapad capability bits.
+                Bit 8-10: 1 - Intel graphic only
+                          2 - ATI graphic only
+                          3 - Nvidia graphic only
+                          4 - Intel and ATI graphic
+                          5 - Intel and Nvidia graphic
+                Bit 16: Bluetooth exist (1 for exist)
+                Bit 17: 3G exist (1 for exist)
+                Bit 18: Wifi exist (1 for exist)
+                Bit 19: Camera exist (1 for exist)
+
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 43f48098220d..c4a6e148732a 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -581,3 +581,14 @@ Why:	This driver has been superseded by g_mass_storage.
 Who:    Alan Stern <stern@rowland.harvard.edu>
 
 ----------------------------
+
+What:   threeg and interface sysfs files in /sys/devices/platform/acer-wmi
+When:   2012
+Why:    In 3.0, we can now autodetect internal 3G device and already have
+        the threeg rfkill device. So, we plan to remove threeg sysfs support
+        for it's no longer necessary.
+
+        We also plan to remove interface sysfs file that exposed which ACPI-WMI
+        interface that was used by acer-wmi driver. It will replaced by
+        information log when acer-wmi initial.
+Who:    Lee, Chun-Yi <jlee@novell.com>