From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Jan 2013 21:10:18 +0000 (-0800)
Subject: Merge tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: upstream/snapshot3+hdmi~5928
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f738967e89584f99c6a11c6bf09b16c50b6a03e;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'pinctrl-fixes' of git://git./linux/kernel/git/linusw/linux-pinctrl

Pull pinctrl fixes from Linus Walleij:
 "A first round of pinctrl fixes for v3.8:
   - i.MX5 register configuration
   - Swap a kfree to devm_kfree() to avoid memory corruption in the at91
     driver
   - Add the missing device tree binding doc for the SIRF pin controller
   - Enable the SIRF GPIO pull up/down configuration from the device
     tree, it was previously retired from the hard-coded approach.
   - NULL check for the prcm_base in the Nomadik pin controller.
   - Provide the prcm_base from the device tree in the DT boot path for
     the Nomadik pin controller."

* tag 'pinctrl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  ARM: ux500: add pinctrl address resources
  pinctrl: nomadik: return if prcm_base is NULL
  pinctrl: sirf: enable GPIO pullup/down configuration from dts
  pinctrl: sirf: add missing DT-binding document
  pinctrl: fix comment mistake
  drivers/pinctrl/pinctrl-at91.c: convert kfree to devm_kfree
  pinctrl: imx5: fix GPIO_8 pad CAN1_RXCAN configuration
---

5f738967e89584f99c6a11c6bf09b16c50b6a03e