Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@konsulko.com>
Sat, 1 Aug 2015 00:16:21 +0000 (20:16 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 1 Aug 2015 00:16:21 +0000 (20:16 -0400)
1  2 
Makefile

diff --cc Makefile
Simple merge