From: Alex Shi <alex.shi@linaro.org>
Date: Fri, 13 Jan 2017 04:01:52 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
X-Git-Tag: firefly_0821_release~176^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e30546378ec2c5cc1a5ef97695d8ba859b0abd23;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
---

e30546378ec2c5cc1a5ef97695d8ba859b0abd23