]> git.sur5r.net Git - u-boot/commitdiff
Merge git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Thu, 22 Oct 2015 00:47:40 +0000 (20:47 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 22 Oct 2015 00:47:40 +0000 (20:47 -0400)
1  2 
Makefile
common/malloc_simple.c

diff --cc Makefile
Simple merge
Simple merge