“15147ffd57576fc00a23ad8a020ff46493a4f924”上不存在“README.md”
  • A
    Merge branch 'imx/devel' into next/dt · c72dbae9
    Arnd Bergmann 提交于
    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: NArnd Bergmann <arnd@arndb.de>
    c72dbae9
board-mx53_evk.c 4.5 KB
反馈
建议
客服 返回
顶部