Merge tag 'auxdisplay-for-linus-v4.19' of git://github.com/ojeda/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Aug 2018 02:23:24 +0000 (19:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Aug 2018 02:23:24 +0000 (19:23 -0700)
commit25ca1d74c6731d9d5f8e660195235050252a33ef
tree60cc82b19a3aca33ec789994a2c5ef43c85d0993
parent70b20dd7f897c6c14ab9e0d8400aed520ab5f09b
parentada953de4486a3e2a42c3b8146adb36d0dcbded2
Merge tag 'auxdisplay-for-linus-v4.19' of git://github.com/ojeda/linux

Pull auxdisplay updates from Miguel Ojeda:
 "Two cleanups for char_lcd:

   - simplify getting .drvdata (Wolfram Sang)

   - delete mdelay in long_sleep (Jia-Ju Bai)"

* tag 'auxdisplay-for-linus-v4.19' of git://github.com/ojeda/linux:
  auxdisplay: simplify getting .drvdata
  auxdisplay: charlcd: delete mdelay in long_sleep