]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ba2bc8 3a21773)
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 15 Jan 2014 14:18:04 +0000 (15:18 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Wed, 15 Jan 2014 14:18:04 +0000 (15:18 +0100)
1  2 
boards.cfg patch | diff1 | diff2 | blob | history

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