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

Lukasz Majewski
2014-04-08T08:34:09Z

I can confirm that Albert's solution provided at u-boot-denx-arm/merged
works at Samsung's Trats device.

Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>

--
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group