Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Tue, 11 Aug 2009 19:44:55 +0000 (21:44 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 11 Aug 2009 19:44:55 +0000 (21:44 +0200)

Trivial merge