arch/arm/mach-imx/mach-pcm037.c · a1f1c7efb0c1c78b5e84455bb5a6c8b2bee3059c · jan.koester / Linux · GitLab

Oct 31, 2011
7e0cac63
Merge branch 'imx/devel' into imx/imx6q · 7e0cac63
Arnd Bergmann authored Oct 31, 2011
```
Conflicts:
	arch/arm/plat-mxc/include/mach/memory.h
```
7e0cac63
Merge branch 'imx/devel' into imx/imx6q
Arnd Bergmann authored Oct 31, 2011
```
Conflicts:
	arch/arm/plat-mxc/include/mach/memory.h
```