Merge branch develop-3.10 into develop-3.10-next
authorHuang, Tao <huangtao@rock-chips.com>
Wed, 10 Dec 2014 12:09:28 +0000 (20:09 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 10 Dec 2014 12:09:28 +0000 (20:09 +0800)
1  2 
drivers/mmc/host/rk_sdmmc.c

Simple merge