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

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

5c1a4b1d0a7c6f78bc833f48a31f7e91d3113428