Merge branch 'master-sync' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Sat, 23 Jan 2010 16:42:03 +0000 (17:42 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 23 Jan 2010 16:42:03 +0000 (17:42 +0100)

Trivial merge