Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorWolfgang Denk <wd@denx.de>
Thu, 31 Mar 2011 07:01:36 +0000 (09:01 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 31 Mar 2011 07:01:36 +0000 (09:01 +0200)

Trivial merge