Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 3 Sep 2013 12:59:18 +0000 (14:59 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 3 Sep 2013 12:59:18 +0000 (14:59 +0200)

Trivial merge