From: libing <libing@rock-chips.com>
Date: Mon, 10 Mar 2014 09:35:08 +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~6165
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=557ff1228e0174fe8c2e8ab5f6dab4bd2ba5c1ac;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
---

557ff1228e0174fe8c2e8ab5f6dab4bd2ba5c1ac