projects / project / bcm63xx / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit5ea67393b8b554b8165c38912d753a8df043020d
tree080077826cffcfebbaa0a950c663e7d165cf6b7dtree | snapshot
parent2395db48869e759c4422efa3d3c25161601aa17bcommit | diff
parentba04f7010958e88a8910f2a123fee53fdc72e013commit | diff
Merge branch 'master' of git://denx.de/git/u-boot-mpc85xx

Conflicts:

include/asm-ppc/fsl_lbc.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
MAKEALL diff1 | diff2 | blob | history
Makefile diff1 | diff2 | blob | history
Broadcom-s U-Boot