Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash master
authorWolfgang Denk <wd@denx.de>
Thu, 4 Mar 2010 20:30:01 +0000 (21:30 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 4 Mar 2010 20:30:01 +0000 (21:30 +0100)
commitef8d008730fb62fc81a792274eea40480593a7d3
tree01d9084ad82c55b187b09f0823df757bcade2a96
parentb003bf79e3f6b278f746bc094f4a78f6f96800f2
parent8f9a221045a4ace14fe006e1353c593619d1001a
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash