Fix the confilcts when merging 'master' into hpc2.
[platform/kernel/u-boot.git] / board / emk /
drwxr-xr-x   ..
drwxr-xr-x - common
drwxr-xr-x - top5200
drwxr-xr-x - top860