From: Olof Johansson <olof@lixom.net>
Date: Sat, 12 May 2012 05:59:11 +0000 (-0700)
Subject: Merge branch 'imx/pinctrl/for-3.5' of git://git.linaro.org/people/shawnguo/linux... 
X-Git-Tag: upstream/snapshot3+hdmi~7446^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a0dfe69fe489b06ae5bad26ae67ae8aefaca3aa;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'imx/pinctrl/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/pinctrl

* 'imx/pinctrl/for-3.5' of git://git.linaro.org/people/shawnguo/linux-2.6: (290 commits)
  ARM: mxs: enable pinctrl support
  video: mxsfb: adopt pinctrl support
  ASoC: mxs-saif: adopt pinctrl support
  i2c: mxs: adopt pinctrl support
  mtd: nand: gpmi: adopt pinctrl support
  mmc: mxs-mmc: adopt pinctrl support
  serial: mxs-auart: adopt pinctrl support
  serial: amba-pl011: adopt pinctrl support
  spi/imx: adopt pinctrl support
  i2c: imx: adopt pinctrl support
  can: flexcan: adopt pinctrl support
  net: fec: adopt pinctrl support
  tty: serial: imx: adopt pinctrl support
  mmc: sdhci-imx-esdhc: adopt pinctrl support
  ARM: imx6q: switch to use pinctrl subsystem
  ARM: mxs: enable pinctrl dummy states
  ARM: imx: enable pinctrl dummy states
  +3.4-rc5 update
---

4a0dfe69fe489b06ae5bad26ae67ae8aefaca3aa