Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorTom Rini <trini@ti.com>
Mon, 2 Feb 2015 16:51:58 +0000 (11:51 -0500)
committerTom Rini <trini@ti.com>
Mon, 2 Feb 2015 16:51:58 +0000 (11:51 -0500)

Trivial merge