Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
authorWolfgang Denk <wd@denx.de>
Thu, 10 Jul 2008 19:53:51 +0000 (21:53 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 10 Jul 2008 19:53:51 +0000 (21:53 +0200)

Trivial merge