Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Tue, 12 Jan 2010 22:30:40 +0000 (23:30 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 12 Jan 2010 22:30:40 +0000 (23:30 +0100)

Trivial merge