Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Wed, 3 Sep 2008 21:44:18 +0000 (23:44 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 3 Sep 2008 21:44:18 +0000 (23:44 +0200)

Trivial merge