Merge branch 'master' of git://git.denx.de/u-boot-ixp
authorWolfgang Denk <wd@denx.de>
Sun, 1 Feb 2009 20:24:38 +0000 (21:24 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 1 Feb 2009 20:24:38 +0000 (21:24 +0100)

Trivial merge