Conflicts: README board/samsung/universal_c210/universal.c drivers/misc/Makefile drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/seaboard.h |
||
---|---|---|
.. | ||
cpu | ||
dts | ||
imx-common | ||
include/asm | ||
lib | ||
config.mk |
Conflicts: README board/samsung/universal_c210/universal.c drivers/misc/Makefile drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/seaboard.h |
||
---|---|---|
.. | ||
cpu | ||
dts | ||
imx-common | ||
include/asm | ||
lib | ||
config.mk |