]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
projects / karo-tx-uboot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 19d829f)
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 5 Sep 2013 09:15:26 +0000 (11:15 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 5 Sep 2013 09:15:26 +0000 (11:15 +0200)
Conflicts:
drivers/serial/serial.c

The conflict above was a trivial case of adding one init
function in each branch, and manually resolved in merge.


No differences found
UBoot for KaRo TX COM modules