Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Sun, 15 May 2011 21:20:10 +0000 (23:20 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 15 May 2011 21:20:10 +0000 (23:20 +0200)

Trivial merge