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

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

6ea75be3c1dd85055b84f5ee0078e9dcaeb576a1