• Arnd Bergmann's avatar
    Merge branch 'imx/devel' into next/dt · c72dbae9
    Arnd Bergmann authored
    The board changes in the imx/devel branch conflict with other changes in
    the device imx/dt branch.
    
    Conflicts:
    	arch/arm/mach-mx5/board-mx53_loco.c
    	arch/arm/mach-mx5/board-mx53_smd.c
    	arch/arm/plat-mxc/include/mach/common.h
    	arch/arm/plat-mxc/include/mach/memory.h
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    c72dbae9
mach-mx21ads.c 7.49 KB