• Linus Torvalds's avatar
    Merge branch 'for_linus' of... · 2ba781ce
    Linus Torvalds authored
    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: (43 commits)
      acer-wmi: support integer return type from WMI methods
      msi-laptop: fix section mismatch in reference from the function load_scm_model_init
      acer-wmi: support to set communication device state by new wmid method
      acer-wmi: allow 64-bits return buffer from WMI methods
      acer-wmi: check the existence of internal 3G device when set capability
      platform/x86:delete two unused variables
      support wlan hotkey on Acer Travelmate 5735Z
      platform-x86: intel_mid_thermal: Fix memory leak
      platform/x86: Fix Makefile for intel_mid_powerbtn
      platform/x86: Simplify intel_mid_powerbtn
      acer-wmi: Delete out-of-date documentation
      acerhdf: Clean up includes
      acerhdf: Drop pointless dependency on THERMAL_HWMON
      acer-wmi: Update MAINTAINERS
      wmi: Orphan ACPI-WMI driver
      tc1100-wmi: Orphan driver
      acer-wmi: does not allow negative number set to initial device state
      platform/oaktrail: ACPI EC Extra driver for Oaktrail
      thinkpad_acpi: Convert printks to pr_<level>
      thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warning
      ...
    2ba781ce
compal-laptop.c 30.3 KB