From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 21 Nov 2013 05:33:20 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android+android... 
X-Git-Tag: firefly_0821_release~6495
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ddcfb41f93c52381e2e8f4a7932cf164b540881e;p=firefly-linux-kernel-4.4.55.git

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

ddcfb41f93c52381e2e8f4a7932cf164b540881e