Hi Allen,
Hi Albert, I did a merge of u-boot/master into u-boot-arm/master and resolved the conflicts and I've pushed the result to:
git://github.com/arm000/u-boot.git branch: u-boot-arm-merge-resolved
I resolved all the conflicts, but the only ones I claim I did correctly were the changes to:
include/configs/seaboard.h include/configs/tegra-common-post.h
the other conflicts were not related to tegra.
If you want a new pull request, you'll first have to unroll the previously merged tegra patches from u-boot-arm/master so I can give you a conflict free merge request.
Thanks Allen, this branch is what I wanted exactly -- I don't want to ask for a rollback. As soon as I am sure about the samsung branch, I'll merge all "fix" branches into ARM.
-Allen
nvpublic
Amicalement,