From: Huang, Tao <huangtao@rock-chips.com>
Date: Fri, 26 Dec 2014 14:26:34 +0000 (+0800)
Subject: Merge branch develop-3.10
X-Git-Tag: firefly_0821_release~4158^2~478
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6b278a8e82ff8b751d63b186477b642f27e922db;p=firefly-linux-kernel-4.4.55.git

Merge branch develop-3.10
---

6b278a8e82ff8b751d63b186477b642f27e922db