Fix the confilcts when merging 'master' into hpc2.
[platform/kernel/u-boot.git] / board / MAI /
drwxr-xr-x   ..
drwxr-xr-x - AmigaOneG3SE
drwxr-xr-x - bios_emulator
drwxr-xr-x - menu