Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Thu, 30 Oct 2008 20:34:40 +0000 (21:34 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 30 Oct 2008 20:34:40 +0000 (21:34 +0100)

Trivial merge