Merge branch 'for_linus' of...
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 ...
No related branches found
No related tags found
Showing
- Documentation/laptops/acer-wmi.txt 0 additions, 184 deletionsDocumentation/laptops/acer-wmi.txt
- MAINTAINERS 3 additions, 8 deletionsMAINTAINERS
- drivers/platform/x86/Kconfig 10 additions, 1 deletiondrivers/platform/x86/Kconfig
- drivers/platform/x86/Makefile 2 additions, 1 deletiondrivers/platform/x86/Makefile
- drivers/platform/x86/acer-wmi.c 159 additions, 25 deletionsdrivers/platform/x86/acer-wmi.c
- drivers/platform/x86/acerhdf.c 1 addition, 3 deletionsdrivers/platform/x86/acerhdf.c
- drivers/platform/x86/asus-laptop.c 17 additions, 17 deletionsdrivers/platform/x86/asus-laptop.c
- drivers/platform/x86/asus-wmi.c 11 additions, 11 deletionsdrivers/platform/x86/asus-wmi.c
- drivers/platform/x86/asus_acpi.c 32 additions, 45 deletionsdrivers/platform/x86/asus_acpi.c
- drivers/platform/x86/compal-laptop.c 9 additions, 13 deletionsdrivers/platform/x86/compal-laptop.c
- drivers/platform/x86/dell-laptop.c 6 additions, 6 deletionsdrivers/platform/x86/dell-laptop.c
- drivers/platform/x86/dell-wmi-aio.c 2 additions, 1 deletiondrivers/platform/x86/dell-wmi-aio.c
- drivers/platform/x86/dell-wmi.c 8 additions, 9 deletionsdrivers/platform/x86/dell-wmi.c
- drivers/platform/x86/eeepc-laptop.c 11 additions, 10 deletionsdrivers/platform/x86/eeepc-laptop.c
- drivers/platform/x86/eeepc-wmi.c 7 additions, 7 deletionsdrivers/platform/x86/eeepc-wmi.c
- drivers/platform/x86/fujitsu-laptop.c 19 additions, 20 deletionsdrivers/platform/x86/fujitsu-laptop.c
- drivers/platform/x86/hdaps.c 10 additions, 9 deletionsdrivers/platform/x86/hdaps.c
- drivers/platform/x86/hp-wmi.c 17 additions, 26 deletionsdrivers/platform/x86/hp-wmi.c
- drivers/platform/x86/ibm_rtl.c 13 additions, 10 deletionsdrivers/platform/x86/ibm_rtl.c
- drivers/platform/x86/ideapad-laptop.c 2 additions, 0 deletionsdrivers/platform/x86/ideapad-laptop.c
Loading
Please register or sign in to comment