arch/arm/mach-mx5/board-mx53_ard.c · 7e0cac630c7c90f12a78131df9913657fa30243b · nexedi / linux · GitLab

Find file Blame History Permalink

Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel · b4cbb8a4
Arnd Bergmann authored Oct 20, 2011
```
Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h
```
b4cbb8a4

board-mx53_ard.c 7.04 KB