Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Wed, 12 Jan 2011 22:55:41 +0000 (23:55 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 12 Jan 2011 22:55:41 +0000 (23:55 +0100)
commit83e5c1c1e1ab29a5b84807bbf7f5dc0561ec83d8
tree5c8b08712582ea3853b93754a447da0c32d7e7e7
parentd52595f69edabc22032dfff52fc0e20c50298565
parent3b8b240ddbd4ec399934c0becb43761c4a8be284
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash