]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2931fa4 4611d5b)
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 6 Jan 2014 07:49:58 +0000 (08:49 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Mon, 6 Jan 2014 07:49:58 +0000 (08:49 +0100)
Conflicts:
include/micrel.h

The conflict above was trivial, caused by four lines being
added in both branches with different whitepace.

1  2 
boards.cfg patch | diff1 | diff2 | blob | history

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