From: sugar <sugar.zhang@rock-chips.com>
Date: Mon, 8 Dec 2014 01:44:14 +0000 (+0800)
Subject: Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into rk30/box/4.4_r1/develop
X-Git-Tag: firefly_0821_release~4411
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=764e56c8498a560a7514d0e59e1aa5715db93ebb;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into rk30/box/4.4_r1/develop
---

764e56c8498a560a7514d0e59e1aa5715db93ebb