Merge branch 'buildman' of git://git.denx.de/u-boot-x86
authorTom Rini <trini@konsulko.com>
Sat, 18 Apr 2015 23:24:13 +0000 (19:24 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 18 Apr 2015 23:24:13 +0000 (19:24 -0400)
1  2 
Makefile

diff --cc Makefile
Simple merge