]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 26 Jan 2015 22:44:49 +0000 (17:44 -0500)
committerTom Rini <trini@ti.com>
Mon, 26 Jan 2015 22:44:49 +0000 (17:44 -0500)

Trivial merge