Merge branch 'master' of git://www.denx.de/git/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Sat, 13 Oct 2007 16:48:23 +0000 (18:48 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 13 Oct 2007 16:48:23 +0000 (18:48 +0200)

Trivial merge