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

Trivial merge