Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Thu, 4 Oct 2012 17:00:42 +0000 (10:00 -0700)
committerTom Rini <trini@ti.com>
Thu, 4 Oct 2012 17:00:42 +0000 (10:00 -0700)
1  2 
MAINTAINERS
common/Makefile

diff --cc MAINTAINERS
Simple merge
diff --cc common/Makefile
Simple merge