Merge branch 'master' of git://git.denx.de/u-boot-nand-flash u-boot-master
authorWolfgang Denk <wd@denx.de>
Sun, 15 May 2011 21:23:36 +0000 (23:23 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 15 May 2011 21:23:36 +0000 (23:23 +0200)
commit535abb96fb665402894b820f934deaca61ce3d3e
treec01c0c54b4983b6fd90bbc0dedbb94058a69957b
parent77467e25600825d2777acec81fd5c12d9b6f6390
parenta9c847cb38991a557c767fd02a71bd5fbdd25a95
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash