Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Mon, 4 Feb 2013 22:50:11 +0000 (17:50 -0500)
committerTom Rini <trini@ti.com>
Mon, 4 Feb 2013 22:50:11 +0000 (17:50 -0500)
commit6e787b7234f7298d487d91dfb40c3146bf194a3e
tree574676d8a12a6d531da9a0e94636a1f5c4f27c46
parent2d795c9621de274cb0cb8cf4af5941293f89c3be
parent99adf6eda7bed1beb3fa3e18951342f67b108db7
Merge branch 'master' of git://git.denx.de/u-boot-x86