tree f4c9cf3a9510842e296d3f72775980e58657e155
parent 6b359b1505210af8f12a1d33add24497dfcc40e7
parent ffcef2fabd8841f890944d10e23d4ba6f32803a3
author Wolfgang Denk <wd@denx.de> 1303685925 +0200
committer Wolfgang Denk <wd@denx.de> 1303685925 +0200

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