]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c2d63e f70fd13)
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Sun, 8 Mar 2009 23:41:48 +0000 (00:41 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 8 Mar 2009 23:41:48 +0000 (00:41 +0100)
Conflicts:
lib_ppc/board.c

Signed-off-by: Wolfgang Denk <wd@denx.de>

Trivial merge
Cloned from git://git.denx.de/u-boot.git