From: roger <cz@rock-chips.com>
Date: Thu, 14 Aug 2014 06:52:36 +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~4899
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a826090f0c1e407d1c2a8bba661412b334bd6e09;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
---

a826090f0c1e407d1c2a8bba661412b334bd6e09