[U-Boot] Merge conflicts between ARM and mainline U-Boot trees

Piotr Wilczek
2014-04-08T08:54:37Z

Acked-by: Piotr Wilczek <p.wilczek@samsung.com>
Tested-by: Piotr Wilczek <p.wilczek@samsung.com>

Tested on Trats2.

Best regards,
Piotr Wilczek