]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 12 Mar 2013 16:27:44 +0000 (17:27 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 12 Mar 2013 16:27:44 +0000 (17:27 +0100)
1  2 
boards.cfg

diff --cc boards.cfg
Simple merge