From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 10 Dec 2013 04:10:55 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into... 
X-Git-Tag: firefly_0821_release~6436^2~3
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f46d87e03fdadad5dea69db3ab038917feed41bf;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into linux-linaro-lsk-v3.10-android+android-common-3.10
---

f46d87e03fdadad5dea69db3ab038917feed41bf