Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Fri, 17 Dec 2010 09:10:20 +0000 (10:10 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 17 Dec 2010 09:10:20 +0000 (10:10 +0100)

Trivial merge