Skip to content
Commit 746667f1 authored by Tom Rini's avatar Tom Rini
Browse files

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



Conflicts:
	arch/x86/cpu/Makefile

Signed-off-by: default avatarTom Rini <trini@ti.com>
parents 6c016485 fe5b9b44
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment