Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Thu, 31 Mar 2011 06:59:32 +0000 (08:59 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 31 Mar 2011 06:59:32 +0000 (08:59 +0200)
commit53ce77eef1090e3f4004398c1d2abb410b63235c
treecee5ca1c3948bfdc8769c6658ced66bcd775487e
parent7ec830d5804337afe19413c3eaedd16583af9076
parentaf5673015315d069b7e2d64acbbf8b5f5fcc385d
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash