Merge git://git.denx.de/u-boot-x86

author Tom Rini <[email protected]>

Thu, 22 Oct 2015 00:47:40 +0000 (20:47 -0400)

committer Tom Rini <[email protected]>

Thu, 22 Oct 2015 00:47:40 +0000 (20:47 -0400)
author Tom Rini <[email protected]>
Thu, 22 Oct 2015 00:47:40 +0000 (20:47 -0400)
committer Tom Rini <[email protected]>
Thu, 22 Oct 2015 00:47:40 +0000 (20:47 -0400)
diff --cc Makefile
Simple merge
diff --cc common/malloc_simple.c
Simple merge
author	Tom Rini <[email protected]>
	Thu, 22 Oct 2015 00:47:40 +0000 (20:47 -0400)
committer	Tom Rini <[email protected]>
	Thu, 22 Oct 2015 00:47:40 +0000 (20:47 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
common/malloc_simple.c	patch \|	diff1 \|	diff2 \|	blob \| history