Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Tue, 25 Sep 2012 19:23:55 +0000 (12:23 -0700)
committerTom Rini <trini@ti.com>
Tue, 25 Sep 2012 19:23:55 +0000 (12:23 -0700)
1  2 
Makefile
README
boards.cfg
common/image.c

diff --cc Makefile
Simple merge
diff --cc README
Simple merge
diff --cc boards.cfg
Simple merge
diff --cc common/image.c
Simple merge