Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Thu, 16 Jul 2009 20:13:45 +0000 (22:13 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 16 Jul 2009 20:13:45 +0000 (22:13 +0200)

Trivial merge