Merge tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jun 2012 16:41:21 +0000 (09:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jun 2012 16:41:21 +0000 (09:41 -0700)
commit61fcbc8dfe40d6fb5e59ab31dfcef67d6019f1a5
tree498e16a152f033641a653f7969a0083399c6dca7
parentf40759e7041498577235192727322186b43aa216
parentdaf731748f978efb4f741d19b499236e03bf667f
Merge tag 'pinctrl-fixes' of git://git./linux/kernel/git/linusw/linux-pinctrl

Pull two pinctrl fixes from Linus Walleij:
 - Fixed a 2-line compile error for MXS
 - A pure documentation fix for Nomadik

* tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl/nomadik: document Alt-C glitch
  pinctrl: mxs: Use kfree to fix build error