Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Fri, 7 Dec 2012 13:43:40 +0000 (06:43 -0700)
committerTom Rini <trini@ti.com>
Fri, 7 Dec 2012 15:47:59 +0000 (08:47 -0700)
1  2 
README

diff --cc README
Simple merge