Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Fri, 11 Jan 2008 23:04:01 +0000 (00:04 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 11 Jan 2008 23:04:01 +0000 (00:04 +0100)

Trivial merge