Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Fri, 11 Jan 2013 21:38:24 +0000 (14:38 -0700)
committerTom Rini <trini@ti.com>
Fri, 11 Jan 2013 21:38:24 +0000 (14:38 -0700)
1  2 
Makefile
README
boards.cfg

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