Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Tue, 13 Jan 2009 23:26:48 +0000 (00:26 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 13 Jan 2009 23:26:48 +0000 (00:26 +0100)

Trivial merge