From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Aug 2019 16:20:17 +0000 (-0700)
Subject: Merge tag 'auxdisplay-for-linus-v5.3-rc5' of git://github.com/ojeda/linux
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=329120423947e8b36fd2f8b5cf69944405d0aece;p=android-x86%2Fkernel.git

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

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

   - A couple of small header cleanups for charlcd (Masahiro Yamada)

   - A trivial typo fix for the examples of cfag12864b (Masahiro Yamada)

   - An Kconfig help text improvement for charlcd (Mans Rullgard)

   - An error path fix for panel (zhengbin)"

* tag 'auxdisplay-for-linus-v5.3-rc5' of git://github.com/ojeda/linux:
  auxdisplay: Fix a typo in cfag12864b-example.c
  auxdisplay: charlcd: add include guard to charlcd.h
  auxdisplay: charlcd: move charlcd.h to drivers/auxdisplay
  auxdisplay: charlcd: add help text for backlight initial state
  auxdisplay: panel: need to delete scan_timer when misc_register fails in panel_attach
---

329120423947e8b36fd2f8b5cf69944405d0aece