Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Mon, 13 Oct 2008 12:18:38 +0000 (14:18 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 13 Oct 2008 12:18:38 +0000 (14:18 +0200)
commitb3ed233198c5ac54aa83dd51f05fcb44ee75f42b
tree15890102135f69969ba2d8710c84b1cf3805ce87
parent392438406041415fe64ab8748ec5ab5ad01d1cf7
parent0d01f66d235118515b5086b88f82498bc0695d6a
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash