Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 18 Dec 2013 20:45:34 +0000 (21:45 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 18 Dec 2013 20:45:34 +0000 (21:45 +0100)

Trivial merge