Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Wed, 12 Jan 2011 22:59:53 +0000 (23:59 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 12 Jan 2011 22:59:53 +0000 (23:59 +0100)

Trivial merge