From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Feb 2021 17:25:48 +0000 (-0800)
Subject: Merge tag 'auxdisplay-for-linus-v5.12' of git://github.com/ojeda/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=66615c4ee2874f07f09caa45c0c3f80973a75952;p=linux.git

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

Pull auxdisplay updates from Miguel Ojeda:
 "A set of auxdisplay fixes and improvements from Geert Uytterhoeven,
  and one from Robin van der Gracht that got lost a long time ago"

* tag 'auxdisplay-for-linus-v5.12' of git://github.com/ojeda/linux:
  auxdisplay: Fix duplicate CHARLCD config symbol
  auxdisplay: ht16k33: Fix refresh rate handling
  dt-bindings: auxdisplay: ht16k33: Convert to json-schema
  dt-bindings: auxdisplay: ht16k33: Fix default-brightness-level range
  dt-bindings: auxdisplay: ht16k33: Keyscan function should be optional
---

66615c4ee2874f07f09caa45c0c3f80973a75952