]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge