Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
author黄涛 <huangtao@rock-chips.com>
Mon, 28 Jul 2014 08:09:07 +0000 (16:09 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 28 Jul 2014 08:09:07 +0000 (16:09 +0800)
commitb5d61451d6b04fbf8d470030fa4bf96235c921f9
tree03cf8cd726727f50785b52a0bd808cff3189c3ca
parentca32c0ff855f688a2dda48bffa2b37fb06bfb507
parent550553622a0fbaeac97b507df3603f70ba9e7d06
Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next
arch/arm/configs/rockchip_defconfig
drivers/mmc/host/dw_mmc-rockchip.c
drivers/mmc/host/rk_sdmmc.c
drivers/video/rockchip/rk_fb.c
include/linux/rk_screen.h