From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Dec 2017 02:17:18 +0000 (-0800)
Subject: Merge tag 'gpio-v4.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: v4.15-rc6~29
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e2a930071d9abf6dccd5442ef499184c963f5df1;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'gpio-v4.15-3' of git://git./linux/kernel/git/linusw/linux-gpio

Pull GPIO fixes from Linus Walleij:
 "Two fixes. They are both kind of important, so why not send a pull
  request on christmas eve.

   - Fix a build problem in the gpio single register created by
     refactorings.

   - Fix assignment of GPIO line names, something that was mangled by
     another patch"

* tag 'gpio-v4.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: fix "gpio-line-names" property retrieval
  gpio: gpio-reg: fix build
---

e2a930071d9abf6dccd5442ef499184c963f5df1