Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Wed, 26 May 2010 20:36:32 +0000 (22:36 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 26 May 2010 20:36:32 +0000 (22:36 +0200)

Trivial merge