Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 13 Mar 2014 16:43:35 +0000 (17:43 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 13 Mar 2014 16:43:35 +0000 (17:43 +0100)
1  2 
board/wandboard/wandboard.c
boards.cfg

Simple merge
diff --cc boards.cfg
Simple merge