Merge branch 'master' of git://git.denx.de/u-boot-sh
authorWolfgang Denk <wd@denx.de>
Mon, 21 Mar 2011 20:38:29 +0000 (21:38 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 21 Mar 2011 20:38:29 +0000 (21:38 +0100)

Trivial merge