diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-01 18:55:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-01 18:55:34 -0700 |
| commit | 05fde26a943a9c55d8b498d97bb49d3d207e5069 (patch) | |
| tree | 6564ec744624e4eb3a08532e031615b8cb910676 /MAINTAINERS | |
| parent | 2d01eedf1d14432f4db5388a49dc5596a8c5bd02 (diff) | |
| parent | 5ee7041e5bc0fe8ba04a554dc2f9a18f709bc005 (diff) | |
Merge tag 'platform-drivers-x86-v4.2-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
Pull x86 platform driver updates from Darren Hart:
"Fairly routine update for platform-drivers-x86.
Mostly fixes and cleanups, with a significant refactoring of toshiba*
drivers. Includes the addition of the dell-rbtn driver.
Details:
asus-wmi:
- fan control
dell*:
- add Dell airplane mode switch driver
ideapad-laptop:
- platform rfkill fixes, and regression fix
pvpanic:
- handle missing _STA correctly
toshiba*:
- rafactor bluetooth support
- haps documentation
- driver cleanup
other:
- Use acpi_video_unregister_backlight instead of
acpi_video_unregister in serveral drivers.
- Orphan msi-wmi.
* tag 'platform-drivers-x86-v4.2-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (24 commits)
MAINTAINERS: Orphan x86 driver msi-wmi
ideapad: fix software rfkill setting
dell-laptop: Use dell-rbtn instead i8042 filter when possible
dell-rbtn: Export notifier for other kernel modules
dell-rbtn: Dell Airplane Mode Switch driver
samsung-laptop: Use acpi_video_unregister_backlight instead of acpi_video_unregister
asus-wmi: Use acpi_video_unregister_backlight instead of acpi_video_unregister
apple_gmux: Use acpi_video_unregister_backlight instead of acpi_video_unregister
pvpanic: handle missing _STA correctly
ideapad_laptop: Lenovo G50-30 fix rfkill reports wireless blocked
asus-wmi: add fan control
Documentation/ABI: Add file describing the sysfs entries for toshiba_haps
toshiba_haps: Make use of DEVICE_ATTR_{RW, WO} macros
toshiba_haps: Replace sscanf with kstrtoint
toshiba_acpi: Bump driver version to 0.22
toshiba_acpi: Remove TOS_FAILURE check from some functions
toshiba_acpi: Comments cleanup
toshiba_acpi: Rename hci_{read, write}1 functions
toshiba_acpi: Remove no longer needed hci_{read, write}2 functions
toshiba_bluetooth: Change BT status message to debug
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 058b0fbc52ff..7628df31b630 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3216,6 +3216,11 @@ L: platform-driver-x86@vger.kernel.org S: Maintained F: drivers/platform/x86/dell-laptop.c +DELL LAPTOP RBTN DRIVER +M: Pali Rohár <pali.rohar@gmail.com> +S: Maintained +F: drivers/platform/x86/dell-rbtn.* + DELL LAPTOP FREEFALL DRIVER M: Pali Rohár <pali.rohar@gmail.com> S: Maintained @@ -6786,9 +6791,8 @@ S: Maintained F: drivers/platform/x86/msi-laptop.c MSI WMI SUPPORT -M: Anisse Astier <anisse@astier.eu> L: platform-driver-x86@vger.kernel.org -S: Supported +S: Orphan F: drivers/platform/x86/msi-wmi.c MSI001 MEDIA DRIVER |