Merge branch 'master' of git://git.denx.de/u-boot-mpc86xx
authorWolfgang Denk <wd@denx.de>
Tue, 18 Nov 2008 20:40:38 +0000 (21:40 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 18 Nov 2008 20:40:38 +0000 (21:40 +0100)

Trivial merge