Fix the confilcts when merging 'master' into hpc2.
[platform/kernel/u-boot.git] / board / prodrive /
drwxr-xr-x   ..
drwxr-xr-x - alpr
drwxr-xr-x - common
drwxr-xr-x - p3mx
drwxr-xr-x - p3p440
drwxr-xr-x - pdnb3