Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Tue, 7 Jul 2009 18:54:12 +0000 (20:54 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 7 Jul 2009 18:54:12 +0000 (20:54 +0200)

Trivial merge