Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Sat, 24 May 2014 10:34:08 +0000 (06:34 -0400)
committerTom Rini <trini@ti.com>
Sat, 24 May 2014 10:34:08 +0000 (06:34 -0400)
1  2 
Makefile
boards.cfg

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