Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Tue, 12 Oct 2010 18:44:46 +0000 (20:44 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 12 Oct 2010 18:44:46 +0000 (20:44 +0200)

Trivial merge