Merge branch 'master' of git://git.denx.de/u-boot-mpc86xx
authorWolfgang Denk <wd@denx.de>
Thu, 30 Oct 2008 19:57:46 +0000 (20:57 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 30 Oct 2008 19:57:46 +0000 (20:57 +0100)

Trivial merge