From: roger <cz@rock-chips.com>
Date: Thu, 14 Aug 2014 08:10:58 +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~4897
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=334acec1827d1fed52d6f556c881c1c98028b999;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
---

334acec1827d1fed52d6f556c881c1c98028b999