diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-11 22:59:11 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-11 22:59:11 -0700 |
commit | 4a0dfe69fe489b06ae5bad26ae67ae8aefaca3aa (patch) | |
tree | cdac4232b95103402e8328815be80105620d41f2 /fs/xfs/xfs_aops.h | |
parent | 7488185d0777ef84be7b365b08037fc7213010f6 (diff) | |
parent | a0f5e3631b07cabf624e7d818df76d47d9d21017 (diff) |
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
Diffstat (limited to 'fs/xfs/xfs_aops.h')
0 files changed, 0 insertions, 0 deletions