Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Sun, 6 Feb 2011 21:28:34 +0000 (22:28 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 6 Feb 2011 21:28:34 +0000 (22:28 +0100)

Trivial merge