projects / oweals / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e62d5fb 8467fae)
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)
commit19d829fa60fc4e6df514a046142faaaf9fc8185d
tree295c75b0d9f3c7180f23ec131442286cf91db5b1tree | snapshot
parente62d5fb0da76ef168e90cae9bbbda80349aaf137commit | diff
parent8467faef7fce8c5faad7224b7737a58e16c52186commit | diff
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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.
boards.cfg diff1 | diff2 | blob | history
config.mk diff1 | diff2 | blob | history
drivers/serial/serial.c diff1 | diff2 | blob | history
tools/Makefile diff1 | diff2 | blob | history
tools/imximage.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.