]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Fri, 30 May 2014 15:34:39 +0000 (11:34 -0400)
committerTom Rini <trini@ti.com>
Fri, 30 May 2014 15:34:39 +0000 (11:34 -0400)
1  2 
Makefile
boards.cfg

diff --cc Makefile
Simple merge
diff --cc boards.cfg
Simple merge