Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash
authorWolfgang Denk <wd@denx.de>
Thu, 19 Jun 2008 20:57:06 +0000 (22:57 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 19 Jun 2008 20:57:06 +0000 (22:57 +0200)
commit51a6ca2c3a65560079d1fbe3a4c1246b5fb19059
tree5af9ead06f5c7b31ac410eed399cb892cd10f817
parentb4fe1a71090c73efc6e4188eed188b2ff67fc02a
parent9e4006bca3d9fb4a2d061996771036cb01e539d3
Merge branch 'master' of git://denx.de/git/u-boot-nand-flash