Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Thu, 14 Feb 2008 23:12:52 +0000 (00:12 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 14 Feb 2008 23:12:52 +0000 (00:12 +0100)

Trivial merge