Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Sat, 27 Mar 2010 23:11:16 +0000 (00:11 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 27 Mar 2010 23:11:16 +0000 (00:11 +0100)
commit4284f36a3e7d534b533ce733e088f226c3eda733
tree090b739a0e31adf327bab66c1ac2f25b7e6de197
parentc550afada5fcad426aa6a219a329feb9eedae8b2
parentc40c94a3d20a8616264c2dfcda85279185d69aeb
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash