tree 6e13b3676f2ab866ac42499d4e81c94ba2226028
parent 19b4ffd1d92198337be4ef5ee915f7717ef2af68
parent 3f483404ff5d929c6637a460ae97bd76cec7ef48
author Wolfgang Denk <wd@denx.de> 1247521107 +0200
committer Wolfgang Denk <wd@denx.de> 1247521107 +0200

Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash