Merge branch 'master' of git://www.denx.de/git/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Tue, 12 Aug 2008 09:46:56 +0000 (11:46 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 12 Aug 2008 09:46:56 +0000 (11:46 +0200)

Trivial merge