Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Thu, 11 Jun 2009 21:53:15 +0000 (23:53 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 11 Jun 2009 21:53:15 +0000 (23:53 +0200)

Trivial merge