Merge tag 'gpio-v4.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Jun 2017 00:40:41 +0000 (17:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Jun 2017 00:40:41 +0000 (17:40 -0700)
commit25b2398f5c0167accd6d0ab18db0561ac22ca6cc
treefa00cc450f3f8e6b4d6c9d7c4ce338d6b744bfe0
parent51c933f208c51b3e5371779ba3c246bde144ed11
parent6c7515c61ffa0985c57abd8892c7928b52b9a306
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