tree e42c7fd72cb1ef97a5a05a73b06b3cd2fc118147
parent 6c016485a685b5cdac28edb25147311a3e88d51f
parent fe5b9b447c6eea3873833b1f3ba15c9854aa2ef8
author Tom Rini <trini@ti.com> 1416848400 -0500
committer Tom Rini <trini@ti.com> 1416848400 -0500

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

Conflicts:
	arch/x86/cpu/Makefile

Signed-off-by: Tom Rini <trini@ti.com>