Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorTom Rini <trini@ti.com>
Fri, 6 Dec 2013 12:19:09 +0000 (07:19 -0500)
committerTom Rini <trini@ti.com>
Fri, 6 Dec 2013 12:19:09 +0000 (07:19 -0500)

Trivial merge