Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 2 Feb 2013 18:29:59 +0000 (19:29 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 2 Feb 2013 18:29:59 +0000 (19:29 +0100)
1  2 
Makefile
boards.cfg
spl/Makefile

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