Merge tag 'auxdisplay-for-greg-v4.19-rc6' of https://github.com/ojeda/linux
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 30 Sep 2018 13:20:33 +0000 (06:20 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 30 Sep 2018 13:20:33 +0000 (06:20 -0700)
commit9a10b063758c756a4d60d63acb890c27d03c9bef
treef4f44b0388f05453644ca4846a8247899a760d99
parent9ba6873e1603988adf97dd5abe18936a2aeff1fd
parent03d179a840ce9e694db9d69bb643fdee04cfd28f
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
MAINTAINERS