Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Wed, 15 Oct 2008 09:31:50 +0000 (11:31 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 15 Oct 2008 09:31:50 +0000 (11:31 +0200)

Trivial merge