Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
authorWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 19:23:16 +0000 (21:23 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 19:23:16 +0000 (21:23 +0200)

Trivial merge