]> git.sur5r.net Git - u-boot/commit
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae12c75 cae4d04)
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorTom Rini <trini@ti.com>
Mon, 4 Nov 2013 14:28:08 +0000 (09:28 -0500)
committerTom Rini <trini@ti.com>
Mon, 4 Nov 2013 14:28:08 +0000 (09:28 -0500)
commitc0bb110b695130866838518e680bdd5473e47928
tree590563a50a027ad53867b2144e763de02427db59tree | snapshot
parentae12c751e5532904090c23f079e4b59160caef52commit | diff
parentcae4d0403c0863176f228d410d6a29b3f4b9d595commit | diff
Merge branch 'master' of git://git.denx.de/u-boot-blackfin

Easy to resolve conflict on the GPIO change.

Conflicts:
arch/blackfin/cpu/Makefile

Signed-off-by: Tom Rini <trini@ti.com>
arch/blackfin/cpu/Makefile diff1 | diff2 | blob | history
Cloned from git://git.denx.de/u-boot.git