Conflicts: arch/arm/include/asm/arch-zynq/hardware.h The conflict above was trivial and solved during merge. |
||
---|---|---|
.. | ||
hardware.h | ||
sys_proto.h |
Conflicts: arch/arm/include/asm/arch-zynq/hardware.h The conflict above was trivial and solved during merge. |
||
---|---|---|
.. | ||
hardware.h | ||
sys_proto.h |