From: roger <cz@rock-chips.com>
Date: Thu, 4 Sep 2014 03:27:07 +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~4759
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5dd5383e7dbef143dbec27e0075630147f350395;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
---

5dd5383e7dbef143dbec27e0075630147f350395