diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-10-22 12:04:33 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-10-22 12:04:33 -0700 |
| commit | cacd9759eea2f1c7e8792ecd91ed4602f963b1a5 (patch) | |
| tree | 59281a932bf0b3d736044eb33067cf1507ada1d7 /MAINTAINERS | |
| parent | 13c1c5e4d7f887cba36c5e3df3faa22071c1469f (diff) | |
| parent | f39f8688888ae74fa8deae2d01289b69b4727394 (diff) | |
| download | linux-cacd9759eea2f1c7e8792ecd91ed4602f963b1a5.tar.bz2 | |
Merge branch 'next' into for-linus
Prepare input updates for 4.20 merge window.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 57eba2829a6c..fb742af44430 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3953,7 +3953,7 @@ D-LINK DIR-685 TOUCHKEYS DRIVER M: Linus Walleij <linus.walleij@linaro.org> L: linux-input@vger.kernel.org S: Supported -F: drivers/input/dlink-dir685-touchkeys.c +F: drivers/input/keyboard/dlink-dir685-touchkeys.c DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK M: Joshua Kinard <kumba@gentoo.org> |