]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
Merge git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@ti.com>
Sat, 10 Jan 2015 18:27:27 +0000 (13:27 -0500)
committerTom Rini <trini@ti.com>
Sat, 10 Jan 2015 18:27:27 +0000 (13:27 -0500)

Trivial merge