From: wdc <wdc@rock-chips.com>
Date: Wed, 3 Sep 2014 01:23:39 +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~4769
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3142d3667b339d49d0004dfaa7b71d45f2cb65f3;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
---

3142d3667b339d49d0004dfaa7b71d45f2cb65f3