From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Jun 2017 00:40:41 +0000 (-0700)
Subject: Merge tag 'gpio-v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: v4.14-rc1~690
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25b2398f5c0167accd6d0ab18db0561ac22ca6cc;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull GPIO fix from Linus Walleij:
 "A single GPIO patch fixing the compatible string for the MVEBU PWM
  controller embedded in the GPIO controller before we release v4.12.
  Hopefully"

* tag 'gpio-v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: mvebu: change compatible string for PWM support
---

25b2398f5c0167accd6d0ab18db0561ac22ca6cc