Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Tue, 25 Nov 2008 11:04:41 +0000 (12:04 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 25 Nov 2008 11:04:41 +0000 (12:04 +0100)

Trivial merge