]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f14f30 39826f0)
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Sat, 20 Oct 2012 01:23:38 +0000 (18:23 -0700)
committerTom Rini <trini@ti.com>
Sat, 20 Oct 2012 01:23:38 +0000 (18:23 -0700)
Conflicts:
drivers/serial/serial_lh7a40x.c

Signed-off-by: Tom Rini <trini@ti.com>
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
boards.cfg patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge
"Das U-Boot" Source Tree