Merge branch 'master-sync' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Tue, 24 Nov 2009 22:22:50 +0000 (23:22 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 24 Nov 2009 22:22:50 +0000 (23:22 +0100)

Trivial merge