Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Fri, 11 Feb 2011 20:23:33 +0000 (21:23 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 11 Feb 2011 20:23:33 +0000 (21:23 +0100)

Trivial merge