Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Wed, 28 Oct 2009 20:50:09 +0000 (21:50 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 28 Oct 2009 20:50:09 +0000 (21:50 +0100)
commitf2b4bc04d6aed6be712d236dab48ac4c4da22cbf
tree2f41852ff62ed6018184ffeab4da9a7b0fc13962
parentd187fcaaa24399068ca04d7f3f9b56fdde3fc3f0
parentfa36ae790eb10ce70935f9a78f07703719dca422
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash