Merge branch 'master-sync' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Mon, 9 Nov 2009 21:46:32 +0000 (22:46 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 9 Nov 2009 21:46:32 +0000 (22:46 +0100)

Trivial merge