Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 12:56:55 +0000 (13:56 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 23 Jan 2008 12:56:55 +0000 (13:56 +0100)

Trivial merge