Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorWolfgang Denk <wd@denx.de>
Mon, 6 Dec 2010 22:44:06 +0000 (23:44 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 6 Dec 2010 22:44:06 +0000 (23:44 +0100)
commitf61f59da0fdcec37046680de3972709fe65282ac
treeab8502828706fecf043c9d572a4dbf623caeac17
parent888279b5ed8a6243eda81af84a98adc64c5e4453
parent64b68178489b6845bcf460e9c6e618cb81740faf
Merge branch 'master' of git://git.denx.de/u-boot-ubi