Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Sun, 2 Mar 2008 20:46:20 +0000 (21:46 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 2 Mar 2008 20:46:20 +0000 (21:46 +0100)

Trivial merge