]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a90bed7 e7f9350)
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 16 May 2014 15:56:50 +0000 (17:56 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 16 May 2014 15:56:50 +0000 (17:56 +0200)
1  2 
boards.cfg patch | diff1 | diff2 | blob | history

diff --cc boards.cfg
Simple merge
Cloned from git://git.denx.de/u-boot.git