Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 19 Jun 2013 21:58:01 +0000 (23:58 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 19 Jun 2013 21:58:01 +0000 (23:58 +0200)

Trivial merge