Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Fri, 9 May 2008 22:18:22 +0000 (00:18 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 9 May 2008 22:18:22 +0000 (00:18 +0200)

Trivial merge