Merge branch 'tom' of git://git.denx.de/u-boot-x86

author Tom Rini <trini@ti.com>

Fri, 9 May 2014 22:48:26 +0000 (18:48 -0400)

committer Tom Rini <trini@ti.com>

Fri, 9 May 2014 22:48:26 +0000 (18:48 -0400)
author Tom Rini <trini@ti.com>
Fri, 9 May 2014 22:48:26 +0000 (18:48 -0400)
committer Tom Rini <trini@ti.com>
Fri, 9 May 2014 22:48:26 +0000 (18:48 -0400)
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
author	Tom Rini <trini@ti.com>
	Fri, 9 May 2014 22:48:26 +0000 (18:48 -0400)
committer	Tom Rini <trini@ti.com>
	Fri, 9 May 2014 22:48:26 +0000 (18:48 -0400)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
boards.cfg	patch \|	diff1 \|	diff2 \|	blob \| history