diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 09:20:33 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-30 09:20:33 -0400 |
| commit | 9a10b063758c756a4d60d63acb890c27d03c9bef (patch) | |
| tree | f4f44b0388f05453644ca4846a8247899a760d99 | |
| parent | 9ba6873e1603988adf97dd5abe18936a2aeff1fd (diff) | |
| parent | 03d179a840ce9e694db9d69bb643fdee04cfd28f (diff) | |
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-- | MAINTAINERS | 2 |
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> | |||
| 10942 | M: Ksenija Stanojevic <ksenija.stanojevic@gmail.com> | 10942 | M: Ksenija Stanojevic <ksenija.stanojevic@gmail.com> |
| 10943 | S: Odd Fixes | 10943 | S: Odd Fixes |
| 10944 | F: Documentation/auxdisplay/lcd-panel-cgram.txt | 10944 | F: Documentation/auxdisplay/lcd-panel-cgram.txt |
| 10945 | F: drivers/misc/panel.c | 10945 | F: drivers/auxdisplay/panel.c |
| 10946 | 10946 | ||
| 10947 | PARALLEL PORT SUBSYSTEM | 10947 | PARALLEL PORT SUBSYSTEM |
| 10948 | M: Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 10948 | M: Sudip Mukherjee <sudipm.mukherjee@gmail.com> |