Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Thu, 19 Jun 2008 20:58:36 +0000 (22:58 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 19 Jun 2008 20:58:36 +0000 (22:58 +0200)
commit914f58c5766860373a7d232e961cee5a4b54a55b
tree1f7f373079ec09168de183f164b7bf0c41b57386
parent8115c6f9eb6b030cc52b61acdcb44cdf1d2876b8
parentfb8c061ea05fc68d37e2a8b9f8c949d76c8d71a8
Merge branch 'master' of git://denx.de/git/u-boot-cfi-flash