Merge branch 'rk_develop-3.10' into rk_develop-3.10-next
authordalon.zhang <dalon.zhang@rock-chips.com>
Thu, 19 Mar 2015 08:42:17 +0000 (16:42 +0800)
committerdalon.zhang <dalon.zhang@rock-chips.com>
Thu, 19 Mar 2015 08:42:17 +0000 (16:42 +0800)
commitbf3c956402dcbea85d4551dbe9bd2ee1451a3a8d
tree3fc95e402efb2ae82b0f617f9c5ccd2ccd7cb3ce
parent7325ef9db947ecba3436be19b04ae816a7c6ca7a
parent13549edf67632c7a41dad1ca2fa8d9f0ff19d45a
Merge branch 'rk_develop-3.10' into rk_develop-3.10-next

Conflicts:
drivers/mmc/host/rk_sdmmc.c
arch/arm/boot/dts/rk3036.dtsi
arch/arm/boot/dts/rk312x.dtsi
drivers/media/video/rk_camsys/camsys_internal.h
drivers/mmc/host/rk_sdmmc.c