Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
authorzwl <zwl@rockchips.com>
Wed, 19 Mar 2014 09:01:05 +0000 (17:01 +0800)
committerzwl <zwl@rockchips.com>
Wed, 19 Mar 2014 09:01:05 +0000 (17:01 +0800)
1  2 
drivers/video/rockchip/rk_fb.c

Simple merge