mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-16 09:43:39 +09:00
6d4511b2c6
Conflicts: arch/arm/include/asm/arch-zynq/hardware.h The conflict above was trivial and solved during merge. |
||
---|---|---|
.. | ||
hardware.h | ||
sys_proto.h |