]> git.sur5r.net Git - u-boot/commit
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)
commit014c595f12d4f7e14cb10188f856465b2d41718f
tree9130a01fbb5499975530a20a559dbaba9a1f2a89
parent9c2d63ec0e9520948b6d598ea32e9aa4e0de847f
parentf70fd13e2fe4cf58e251271c27f9c06e141d7f9a
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

Conflicts:
lib_ppc/board.c

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