Merge branch develop-3.10 into develop-3.10-next
authorHuang, Tao <huangtao@rock-chips.com>
Tue, 16 Dec 2014 12:36:30 +0000 (20:36 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Tue, 16 Dec 2014 12:36:30 +0000 (20:36 +0800)
1  2 
drivers/video/rockchip/iep/iep_drv.c

Simple merge