diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-19 08:00:41 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-19 08:00:41 -0700 |
| commit | f3f08dcb9965f42378851ce888fb7539607712e6 (patch) | |
| tree | 9fd6f0060757ca354c97d69a1719ba2f4d7c3953 /arch/arm/mach-omap2/am35xx-emac.c | |
| parent | cbd8d842319c8084c050292e7d167be2a4cf1ad9 (diff) | |
| parent | 3e48b1baa042a4d5e92f373fc945a4aa0081178b (diff) | |
| download | blackbird-op-linux-f3f08dcb9965f42378851ce888fb7539607712e6.tar.gz blackbird-op-linux-f3f08dcb9965f42378851ce888fb7539607712e6.zip | |
Merge branch 'imx/pinctrl' into next/pinctrl
* imx/pinctrl:
mtd: nand: gpmi: fix compile error caused by pinctrl call
Diffstat (limited to 'arch/arm/mach-omap2/am35xx-emac.c')
0 files changed, 0 insertions, 0 deletions
