Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorWolfgang Denk <wd@denx.de>
Fri, 21 May 2010 20:26:14 +0000 (22:26 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 21 May 2010 20:26:14 +0000 (22:26 +0200)
commit8b79f2ce80d62e92d11ca90e472f240305e14f1f
tree6bd44d41195d141a5982222de38d30469e9a9062
parent8a452c2c17bc284e3f91b8ed4aec9d2b9b342df7
parentbdc5f06789c5a0c3a9a2c0eb33ec4d177dbdaa22
Merge branch 'master' of git://git.denx.de/u-boot-ubi