Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Tue, 29 Apr 2008 18:04:56 +0000 (20:04 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 29 Apr 2008 18:04:56 +0000 (20:04 +0200)

Trivial merge