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)
commitdb7a7dee6878fe7539d5967de1caff83246254e0
tree27a94cac552d2015cc53cd29658f15f834475a5c
parentc956662cc3e2475b451afa9a8b639c0ccc49d432
parentba877efb802edb7080703e4dd99e51a437e44f26
Merge branch 'master' of git://git.denx.de/u-boot-x86
Makefile
arch/x86/include/asm/u-boot-x86.h