]> git.ipfire.org Git - people/ms/u-boot.git/commit
projects / people / ms / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita891601ce51edbafa1a2750c96a618e4fcbca1c2
tree9a5d44eb1fcca45dfd30557318f786b66392a8f3tree | snapshot
parent2931fa4db349c97f882ffda42e901208654b5ca9commit | diff
parent4611d5bab26f93471b84f6f33967cef69b3f723acommit | diff
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Conflicts:
include/micrel.h

The conflict above was trivial, caused by four lines being
added in both branches with different whitepace.
boards.cfg diff1 | diff2 | blob | history
"Das U-Boot" Source Tree