From: Huang, Tao <huangtao@rock-chips.com>
Date: Wed, 3 Dec 2014 11:10:23 +0000 (+0800)
Subject: Merge branch develop-3.10 into develop-3.10-next
X-Git-Tag: firefly_0821_release~4158^2~572
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f0f3909f35e3d839f26b6fbcc54259c14dc71c3b;p=firefly-linux-kernel-4.4.55.git

Merge branch develop-3.10 into develop-3.10-next
---

f0f3909f35e3d839f26b6fbcc54259c14dc71c3b