From: Alex Shi <alex.shi@linaro.org>
Date: Fri, 25 Nov 2016 04:55:17 +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~89
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=068e31608ab2e664dce897343a3e5d43c4f023e3;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/usb/gadget/function/u_ether.c
---

068e31608ab2e664dce897343a3e5d43c4f023e3