Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Tue, 15 Jul 2008 19:37:23 +0000 (21:37 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 15 Jul 2008 19:37:23 +0000 (21:37 +0200)

Trivial merge