Merge branch 'tom' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Fri, 9 May 2014 22:48:26 +0000 (18:48 -0400)
committerTom Rini <trini@ti.com>
Fri, 9 May 2014 22:48:26 +0000 (18:48 -0400)
1  2 
README
boards.cfg

diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge