Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Wed, 9 Feb 2011 20:22:58 +0000 (21:22 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Feb 2011 20:22:58 +0000 (21:22 +0100)
commit494a7d215bfba17f1a94736df40c332c8713c30e
treeda0e60e5a6e3bc887fb6952c54a4bde1365aa35d
parent65b57ebb3031a60dddd451097dc5c435fb051b6f
parenteef1d7199d4daf004cfb60914c9e1dc197e32c5d
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash