From: Huang, Tao <huangtao@rock-chips.com>
Date: Tue, 2 Jun 2015 03:25:51 +0000 (+0800)
Subject: Merge branch android-common-3.10
X-Git-Tag: firefly_0821_release~4090
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e82146650ea5de8205f8890eaf4cb98615c51d9a;p=firefly-linux-kernel-4.4.55.git

Merge branch android-common-3.10
---

e82146650ea5de8205f8890eaf4cb98615c51d9a