Conflicts: drivers/serial/serial.c The conflict above was a trivial case of adding one init function in each branch, and manually resolved in merge. |
||
---|---|---|
.. | ||
cpu | ||
dts | ||
imx-common | ||
include/asm | ||
lib | ||
config.mk |
Conflicts: drivers/serial/serial.c The conflict above was a trivial case of adding one init function in each branch, and manually resolved in merge. |
||
---|---|---|
.. | ||
cpu | ||
dts | ||
imx-common | ||
include/asm | ||
lib | ||
config.mk |