tree 6672a47e3675e7e79fd0fbf9b491045230b24eed
parent 68e1747f9c0506159e8ecc9a4feb58e9c65a7b39
parent 5c18a1cf3e56e0177388258696be4a17a672e9d0
author Albert ARIBAUD <albert.u.boot@aribaud.net> 1378886367 +0200
committer Albert ARIBAUD <albert.u.boot@aribaud.net> 1378886367 +0200

Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

Conflicts:
	tools/Makefile