Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Sat, 8 May 2010 23:16:51 +0000 (01:16 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 8 May 2010 23:16:51 +0000 (01:16 +0200)

Trivial merge