Merge branch 'master' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:42:56 +0000 (10:42 -0500)
committerTom Rini <trini@ti.com>
Tue, 10 Feb 2015 15:42:56 +0000 (10:42 -0500)
1  2 
Makefile
arch/x86/include/asm/u-boot-x86.h

diff --cc Makefile
Simple merge
Simple merge