Merge branch 'mem' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 4 Mar 2013 16:14:27 +0000 (11:14 -0500)
committerTom Rini <trini@ti.com>
Mon, 4 Mar 2013 16:14:27 +0000 (11:14 -0500)

Trivial merge