From: 陈亮 <cl@rock-chips.com>
Date: Tue, 27 May 2014 06:35:41 +0000 (-0700)
Subject: Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10
X-Git-Tag: firefly_0821_release~5223
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=ba679313e6de48e04ff9058cf0004f7beea85766

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

ba679313e6de48e04ff9058cf0004f7beea85766