From: Huang, Tao <huangtao@rock-chips.com>
Date: Wed, 25 Mar 2015 11:10:16 +0000 (+0800)
Subject: Merge branch develop-3.10
X-Git-Tag: firefly_0821_release~4158^2~285
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=83e32fc6d7aa9fb584b6fe9855e7d503667020c5;p=firefly-linux-kernel-4.4.55.git

Merge branch develop-3.10
---

83e32fc6d7aa9fb584b6fe9855e7d503667020c5