From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Jun 2012 16:41:21 +0000 (-0700)
Subject: Merge tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: firefly_0821_release~3680^2~2584
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=61fcbc8dfe40d6fb5e59ab31dfcef67d6019f1a5;p=firefly-linux-kernel-4.4.55.git

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
---

61fcbc8dfe40d6fb5e59ab31dfcef67d6019f1a5