Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Wed, 11 Nov 2009 22:10:34 +0000 (23:10 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 11 Nov 2009 22:10:34 +0000 (23:10 +0100)

Trivial merge