Merge branch develop-3.10-next
authorHuang, Tao <huangtao@rock-chips.com>
Wed, 20 May 2015 06:49:34 +0000 (14:49 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 20 May 2015 06:49:34 +0000 (14:49 +0800)
commit231897adf5ecd659b5e8eea5ff22da28ba539c15
treec0b15c0ca01dadec755ae7aa06d823d9d910ca1b
parenta597d99bfe9ee219788759a51b84bc86e48f3fe5
parent13cd935ba6391ab58ab52d687c4231b8b1e67684
Merge branch develop-3.10-next
arch/arm/boot/dts/rk3036.dtsi
arch/arm/boot/dts/rk3288.dtsi
drivers/clk/rockchip/clk-ops.c
drivers/media/video/rk_camsys/camsys_internal.h
drivers/mmc/host/rk_sdmmc.c
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
drivers/pwm/pwm-rockchip.c