Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorTom Rini <trini@ti.com>
Tue, 12 Aug 2014 20:54:55 +0000 (16:54 -0400)
committerTom Rini <trini@ti.com>
Tue, 12 Aug 2014 20:54:55 +0000 (16:54 -0400)

Trivial merge