From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Mar 2020 22:32:57 +0000 (-0700)
Subject: Merge tag 'auxdisplay-for-linus-v5.6-rc6' of git://github.com/ojeda/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2a48b37931572802e980dc059e03ec29a33d2963;p=linux.git

Merge tag 'auxdisplay-for-linus-v5.6-rc6' of git://github.com/ojeda/linux

Pull auxdisplay updates from Miguel Ojeda:
 "A few minor auxdisplay improvements:

   - charlcd: replace zero-length array with flexible-array member
     (kernel-wide cleanup by Gustavo A. R. Silva)

   - img-ascii-lcd: convert to devm_platform_ioremap_resource (Yangtao
     Li)

   - Fix Kconfig indentation (Krzysztof Kozlowski)

* tag 'auxdisplay-for-linus-v5.6-rc6' of git://github.com/ojeda/linux:
  auxdisplay: charlcd: replace zero-length array with flexible-array member
  auxdisplay: img-ascii-lcd: convert to devm_platform_ioremap_resource
  auxdisplay: Fix Kconfig indentation
---

2a48b37931572802e980dc059e03ec29a33d2963