tree d05724960f20d8e369945d68283b60d81cdca486
parent 34f44f79fe657eee6fc776c6b4fb03e1a52d634d
parent ce6303106dd0885b25d8f2bef903cf1c602d0f95
author Wolfgang Denk <wd@denx.de> 1254346476 +0200
committer Wolfgang Denk <wd@denx.de> 1254346476 +0200

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