Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Thu, 1 Nov 2007 21:38:01 +0000 (22:38 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 1 Nov 2007 21:38:01 +0000 (22:38 +0100)

Trivial merge