Fix the confilcts when merging 'master' into hpc2.
[platform/kernel/u-boot.git] / board / LEOX /
drwxr-xr-x   ..
drwxr-xr-x - elpt860