Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Sat, 22 Dec 2012 12:55:19 +0000 (05:55 -0700)
committerTom Rini <trini@ti.com>
Sat, 22 Dec 2012 12:55:19 +0000 (05:55 -0700)
1  2 
MAINTAINERS
README
boards.cfg

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