Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Sun, 22 Feb 2009 21:51:25 +0000 (22:51 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 22 Feb 2009 21:51:25 +0000 (22:51 +0100)

Trivial merge