Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@konsulko.com>
Tue, 10 Nov 2015 18:38:08 +0000 (13:38 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 10 Nov 2015 18:38:08 +0000 (13:38 -0500)
1  2 
Makefile

diff --cc Makefile
Simple merge