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)
commita26084749b4fa2ea42705e5c3ed398b445e9c3ce
treee206aacb70e2fa7a5b0fcb7b958378e06ba3bc3b
parent6188958f038dcb66d890405db0e28acd137506e3
parent024b23753469758289a4f8c318d726341eacbfcf
Merge branch develop-3.10

Conflicts:
arch/arm/mach-rockchip/dvfs.c
drivers/media/video/rk_camsys/camsys_internal.h
drivers/video/rockchip/rga/rga_drv.c