Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
authorWolfgang Denk <wd@denx.de>
Sun, 31 Aug 2008 21:53:22 +0000 (23:53 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 31 Aug 2008 21:53:22 +0000 (23:53 +0200)

Trivial merge