diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-24 12:45:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-24 12:45:35 -0800 |
| commit | e1c10879ed59436cde537b723545430b04d4dec0 (patch) | |
| tree | 4ef92d5ca73489757e0327615423bfe022378646 /MAINTAINERS | |
| parent | 81f05fee8c063cfc1614ddba1ce88cb1129f263d (diff) | |
| parent | 6b31de3e698582fe0b8f7f4bab15831b73204800 (diff) | |
Merge tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
Pull x86 platform driver updates from Darren Hart:
"Emergency travel prevented me from completing my final testing on this
until today. Nothing here that couldn't wait until RC1 fixes, but I
thought it best to get it out sooner rather than later as it does
contain a build warning fix.
Summary:
A build warning fix, MAINTAINERS cleanup, and a new DMI quirk:
ideapad-laptop:
- Add Lenovo Yoga 700 to no_hw_rfkill dmi list
MAINTAINERS:
- Combine multiple telemetry entries
intel_telemetry_debugfs:
- Fix unused warnings in telemetry debugfs"
* tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list
MAINTAINERS: Combine multiple telemetry entries
intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 59373e5bb09e..78f71f471bd6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5780,10 +5780,8 @@ INTEL TELEMETRY DRIVER M: Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com> L: platform-driver-x86@vger.kernel.org S: Maintained -F: drivers/platform/x86/intel_telemetry_core.c F: arch/x86/include/asm/intel_telemetry.h -F: drivers/platform/x86/intel_telemetry_pltdrv.c -F: drivers/platform/x86/intel_telemetry_debugfs.c +F: drivers/platform/x86/intel_telemetry* IOC3 ETHERNET DRIVER M: Ralf Baechle <ralf@linux-mips.org> |