]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2395db4 ba04f70)
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 19:33:16 +0000 (21:33 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 19:33:16 +0000 (21:33 +0200)
Conflicts:

include/asm-ppc/fsl_lbc.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
1  2 
MAKEALL patch | diff1 | diff2 | blob | history
Makefile patch | diff1 | diff2 | blob | history

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
Cloned from git://git.denx.de/u-boot.git