summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-30 06:20:33 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-30 06:20:33 -0700
commit9a10b063758c756a4d60d63acb890c27d03c9bef (patch)
treef4f44b0388f05453644ca4846a8247899a760d99
parent9ba6873e1603988adf97dd5abe18936a2aeff1fd (diff)
parent03d179a840ce9e694db9d69bb643fdee04cfd28f (diff)
downloadlinux-9a10b063758c756a4d60d63acb890c27d03c9bef.tar.gz
linux-9a10b063758c756a4d60d63acb890c27d03c9bef.tar.bz2
linux-9a10b063758c756a4d60d63acb890c27d03c9bef.zip
Merge tag 'auxdisplay-for-greg-v4.19-rc6' of https://github.com/ojeda/linux
Miguel writes: "A trivial fix for auxdisplay - MAINTAINERS reference fix for moved file Reported by Joe Perches" * tag 'auxdisplay-for-greg-v4.19-rc6' of https://github.com/ojeda/linux: MAINTAINERS: fix reference to moved drivers/{misc => auxdisplay}/panel.c
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a255240d1452..b22e7fdfd2ea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10942,7 +10942,7 @@ M: Willy Tarreau <willy@haproxy.com>
M: Ksenija Stanojevic <ksenija.stanojevic@gmail.com>
S: Odd Fixes
F: Documentation/auxdisplay/lcd-panel-cgram.txt
-F: drivers/misc/panel.c
+F: drivers/auxdisplay/panel.c
PARALLEL PORT SUBSYSTEM
M: Sudip Mukherjee <sudipm.mukherjee@gmail.com>