Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
authorWolfgang Denk <wd@denx.de>
Wed, 7 Apr 2010 22:26:03 +0000 (00:26 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 7 Apr 2010 22:26:03 +0000 (00:26 +0200)
commita233631095eba3e853049f6656642e3a7ef1d73c
tree8a10b3f15dc1193e5016a36faeffc479119c83e7
parent797131c12595b3d0e2964b706006938c822ee874
parent22d6c8faac4e9fa43232b0cf4da427ec14d72ad3
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash