]> git.sur5r.net Git - u-boot/commit
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
authorWolfgang Denk <wd@denx.de>
Thu, 14 Feb 2008 23:26:52 +0000 (00:26 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 14 Feb 2008 23:26:52 +0000 (00:26 +0100)
commit9e04a8138892d64848dc6e8e74213086d9190d9a
tree1740a361891d2390631ec053f1bc42e524913b78
parent32c70d3420739930165271d9a1b04572adf799fd
parent746c4b9490495dc4381dbcc49f40078d423e0a48
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx

Conflicts:

common/cmd_reginfo.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
common/cmd_reginfo.c
cpu/mpc86xx/start.S