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)
commit6ea75be3c1dd85055b84f5ee0078e9dcaeb576a1
treed8a890896952e028597424c9a160f0c82e397a1f
parent17b650938175667da25708a1e4506f7b63bb9d2d
parent0b6f34f8ac863315b04ff0296bd31682c74eee53
Merge branch develop-3.10 into develop-3.10-next
drivers/video/rockchip/iep/iep_drv.c