Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 20:23:09 +0000 (22:23 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 20:23:09 +0000 (22:23 +0200)
commit776488eb88d0915945eeecfc1ad3e318979f9548
tree12360f11d42ab5552014e36b7ce8524f84154588
parent32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7
parentcc49cadeeb8bb2f0ae3fdc13af7051ae59f083bc
Merge branch 'master' of git://denx.de/git/u-boot-nand-flash