Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
authorWolfgang Denk <wd@denx.de>
Sat, 7 Feb 2009 21:08:53 +0000 (22:08 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 7 Feb 2009 21:08:53 +0000 (22:08 +0100)

Trivial merge