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

Trivial merge