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

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

040cf4804ab5de1d095b709102d4f910f7984906