Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Sun, 17 Oct 2010 18:25:05 +0000 (20:25 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 17 Oct 2010 18:25:05 +0000 (20:25 +0200)
1  2 
common/env_mmc.c

Simple merge