From: chenyifu <chenyf@rock-chips.com>
Date: Fri, 26 Sep 2014 07:16:05 +0000 (+0800)
Subject: Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
X-Git-Tag: firefly_0821_release~4640^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f97068b0eb33bd810b7fd2b630b92a907f8d894;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
---

1f97068b0eb33bd810b7fd2b630b92a907f8d894