Merge branch 'master' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Mon, 8 Feb 2010 21:09:24 +0000 (22:09 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 8 Feb 2010 21:09:24 +0000 (22:09 +0100)

Trivial merge