mmc: core: fix merge bug
author黄涛 <huangtao@rock-chips.com>
Tue, 9 Aug 2011 06:29:04 +0000 (14:29 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 9 Aug 2011 06:29:04 +0000 (14:29 +0800)
commit75f9442e960482c496195079626f5f0e29bba8cb
tree7cd2acbdfec5ad4fefa7c4c773ca0c79c1052fb3
parent2f206fddfe16efd5722cfce24f8335bea3ff6692
mmc: core: fix merge bug
drivers/mmc/core/core.c