Merge branch develop-3.10
authorHuang, Tao <huangtao@rock-chips.com>
Mon, 23 Mar 2015 09:59:35 +0000 (17:59 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Mon, 23 Mar 2015 09:59:35 +0000 (17:59 +0800)
Conflicts:
arch/arm/mach-rockchip/dvfs.c

1  2 
drivers/media/video/rk_camsys/camsys_internal.h
drivers/video/rockchip/rga/rga_drv.c

Simple merge