arch/arm/plat-mxc/include/mach/devices-common.h · c72dbae971400e466ad9ff16c920cd6d9d8c55a1 · Kirill Smelkov / 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

devices-common.h 8.41 KB