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: (81 commits) xo15-ebook: Remove device.wakeup_count ips: use interruptible waits in ips-monitor acer-wmi: does not poll device status when WMI event is available acer-wmi: does not set persistence state by rfkill_init_sw_state platform-drivers: x86: fix common misspellings acer-wmi: use pr_<level> for messages asus-wmi: potential NULL dereference in show_call() asus-wmi: signedness bug in read_brightness() platform-driver-x86: samsung-laptop: make dmi_check_cb to return 1 instead of 0 platform-driver-x86: fix wrong merge for compal-laptop.c msi-laptop: use pr_<level> for messages Platform: add Samsung Laptop platform driver acer-wmi: Fix WMI ID acer-wmi: deactive mail led when power off msi-laptop: send out touchpad on/off key acer-wmi: set the touchpad toggle key code to KEY_TOUCHPAD_TOGGLE platform-driver-x86: intel_mid_thermal: fix unterminated platform_device_id table sony-laptop: potential null dereference sony-laptop: handle allocation failures sony-laptop: return negative on failure in sony_nc_add() ...
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-driver-samsung-laptop 19 additions, 0 deletionsDocumentation/ABI/testing/sysfs-driver-samsung-laptop
- Documentation/ABI/testing/sysfs-platform-asus-wmi 31 additions, 0 deletionsDocumentation/ABI/testing/sysfs-platform-asus-wmi
- Documentation/laptops/sony-laptop.txt 30 additions, 7 deletionsDocumentation/laptops/sony-laptop.txt
- MAINTAINERS 3 additions, 27 deletionsMAINTAINERS
- drivers/platform/x86/Kconfig 85 additions, 5 deletionsdrivers/platform/x86/Kconfig
- drivers/platform/x86/Makefile 8 additions, 1 deletiondrivers/platform/x86/Makefile
- drivers/platform/x86/acer-wmi.c 77 additions, 50 deletionsdrivers/platform/x86/acer-wmi.c
- drivers/platform/x86/asus-laptop.c 21 additions, 161 deletionsdrivers/platform/x86/asus-laptop.c
- drivers/platform/x86/asus-nb-wmi.c 98 additions, 0 deletionsdrivers/platform/x86/asus-nb-wmi.c
- drivers/platform/x86/asus-wmi.c 1656 additions, 0 deletionsdrivers/platform/x86/asus-wmi.c
- drivers/platform/x86/asus-wmi.h 58 additions, 0 deletionsdrivers/platform/x86/asus-wmi.h
- drivers/platform/x86/compal-laptop.c 4 additions, 4 deletionsdrivers/platform/x86/compal-laptop.c
- drivers/platform/x86/dell-wmi-aio.c 171 additions, 0 deletionsdrivers/platform/x86/dell-wmi-aio.c
- drivers/platform/x86/eeepc-laptop.c 1 addition, 1 deletiondrivers/platform/x86/eeepc-laptop.c
- drivers/platform/x86/eeepc-wmi.c 73 additions, 839 deletionsdrivers/platform/x86/eeepc-wmi.c
- drivers/platform/x86/hp-wmi.c 273 additions, 39 deletionsdrivers/platform/x86/hp-wmi.c
- drivers/platform/x86/ideapad-laptop.c 2 additions, 0 deletionsdrivers/platform/x86/ideapad-laptop.c
- drivers/platform/x86/intel_ips.c 1 addition, 1 deletiondrivers/platform/x86/intel_ips.c
- drivers/platform/x86/intel_mid_powerbtn.c 148 additions, 0 deletionsdrivers/platform/x86/intel_mid_powerbtn.c
- drivers/platform/x86/intel_mid_thermal.c 576 additions, 0 deletionsdrivers/platform/x86/intel_mid_thermal.c
Loading
Please register or sign in to comment