Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Tue, 26 Aug 2008 21:14:58 +0000 (23:14 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 26 Aug 2008 21:14:58 +0000 (23:14 +0200)

Trivial merge