Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 10 Jun 2013 16:28:37 +0000 (18:28 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 10 Jun 2013 16:28:37 +0000 (18:28 +0200)

Trivial merge