diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 16:56:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 16:56:02 -0400 |
| commit | 1e8143db755f745a9842984de5e8b423f583aea2 (patch) | |
| tree | a20916e2ae14524bd40a4d9302bd8c064df82692 /MAINTAINERS | |
| parent | 2566278551d3db875bc3bbfc41b42f2e80392108 (diff) | |
| parent | b740d2e9233cb33626d3b62210bcfc6a34baa839 (diff) | |
Merge tag 'platform-drivers-x86-v4.7-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
Pull x86 platform driver updates from Darren Hart:
"Mostly minor updates and cleanups. One new power management
controller driver for Intel Core SoCs.
platform/x86:
- Add PMC Driver for Intel Core SoC
dell-rbtn:
- Ignore ACPI notifications if device is suspended
thinkpad_acpi:
- save kbdlight state on suspend and restore it on resume
intel_menlow:
- reduce code duplication
asus-wmi:
- provide access to ALS control
ideapad-laptop:
- add a new WMI string for ESC key
surfacepro3_button:
- Add a warning when switching to tablet mode
sony-laptop:
- Avoid oops on module unload for older laptops
intel_telemetry:
- Constify telemetry_core_ops structures
fujitsu-laptop:
- Use IS_ENABLED() instead of checking for built-in or module
asus-laptop:
- correct error handling in sysfs_acpi_set
- remove redundant initializers
- correct error handling in asus_read_brightness()
fujitsu-laptop:
- Support radio LED"
* tag 'platform-drivers-x86-v4.7-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
platform/x86: Add PMC Driver for Intel Core SoC
dell-rbtn: Ignore ACPI notifications if device is suspended
thinkpad_acpi: save kbdlight state on suspend and restore it on resume
intel_menlow: reduce code duplication
asus-wmi: provide access to ALS control
ideapad-laptop: add a new WMI string for ESC key
surfacepro3_button: Add a warning when switching to tablet mode
sony-laptop: Avoid oops on module unload for older laptops
intel_telemetry: Constify telemetry_core_ops structures
fujitsu-laptop: Use IS_ENABLED() instead of checking for built-in or module
asus-laptop: correct error handling in sysfs_acpi_set
asus-laptop: remove redundant initializers
asus-laptop: correct error handling in asus_read_brightness()
fujitsu-laptop: Support radio LED
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 312cd77e820c..c68eaeb5a5c0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6096,6 +6096,14 @@ S: Maintained | |||
| 6096 | F: arch/x86/include/asm/intel_telemetry.h | 6096 | F: arch/x86/include/asm/intel_telemetry.h |
| 6097 | F: drivers/platform/x86/intel_telemetry* | 6097 | F: drivers/platform/x86/intel_telemetry* |
| 6098 | 6098 | ||
| 6099 | INTEL PMC CORE DRIVER | ||
| 6100 | M: Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com> | ||
| 6101 | M: Vishwanath Somayaji <vishwanath.somayaji@intel.com> | ||
| 6102 | L: platform-driver-x86@vger.kernel.org | ||
| 6103 | S: Maintained | ||
| 6104 | F: arch/x86/include/asm/pmc_core.h | ||
| 6105 | F: drivers/platform/x86/intel_pmc_core* | ||
| 6106 | |||
| 6099 | IOC3 ETHERNET DRIVER | 6107 | IOC3 ETHERNET DRIVER |
| 6100 | M: Ralf Baechle <ralf@linux-mips.org> | 6108 | M: Ralf Baechle <ralf@linux-mips.org> |
| 6101 | L: linux-mips@linux-mips.org | 6109 | L: linux-mips@linux-mips.org |