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

Trivial merge