Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorTom Rini <trini@ti.com>
Mon, 4 Mar 2013 14:44:42 +0000 (09:44 -0500)
committerTom Rini <trini@ti.com>
Mon, 4 Mar 2013 14:44:42 +0000 (09:44 -0500)

Trivial merge