Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Sat, 23 Oct 2010 19:45:57 +0000 (21:45 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 23 Oct 2010 19:45:57 +0000 (21:45 +0200)

Trivial merge