Merge branch 'master' of git://www.denx.de/git/u-boot-mpc86xx
authorWolfgang Denk <wd@denx.de>
Wed, 16 Jan 2008 21:06:51 +0000 (22:06 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 16 Jan 2008 21:06:51 +0000 (22:06 +0100)

Trivial merge