Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorWolfgang Denk <wd@denx.de>
Mon, 13 Dec 2010 23:18:19 +0000 (00:18 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 13 Dec 2010 23:18:19 +0000 (00:18 +0100)

Trivial merge