Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Tue, 25 Jan 2011 20:13:04 +0000 (21:13 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 25 Jan 2011 20:13:04 +0000 (21:13 +0100)

Trivial merge