Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Mon, 17 May 2010 21:11:21 +0000 (23:11 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 17 May 2010 21:11:21 +0000 (23:11 +0200)

Trivial merge