From: Huang, Tao <huangtao@rock-chips.com>
Date: Tue, 17 Mar 2015 07:16:39 +0000 (+0800)
Subject: Merge branch develop-3.10
X-Git-Tag: firefly_0821_release~4158^2~346
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=05b29f94a4ab4f37071025b0c235516c2616bce6;p=firefly-linux-kernel-4.4.55.git

Merge branch develop-3.10
---

05b29f94a4ab4f37071025b0c235516c2616bce6
diff --cc drivers/video/rockchip/rkfb_sysfs.c
index 6a9f6037f2a2,ffbc0fc3df1c..6a9f6037f2a2
mode 100755,100644..100644
--- a/drivers/video/rockchip/rkfb_sysfs.c
+++ b/drivers/video/rockchip/rkfb_sysfs.c