Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 7 Mar 2014 13:32:42 +0000 (14:32 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 7 Mar 2014 13:32:42 +0000 (14:32 +0100)

Trivial merge