Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorWolfgang Denk <[email protected]>
Fri, 9 Apr 2010 19:49:42 +0000 (21:49 +0200)
committerWolfgang Denk <[email protected]>
Fri, 9 Apr 2010 19:49:42 +0000 (21:49 +0200)

Trivial merge