Merge "Merge tag 'lsk-v4.4-16.12-android' into branch 'msm-4.4'"

author Linux Build Service Account <lnxbuild@localhost>

Sat, 4 Mar 2017 01:39:19 +0000 (17:39 -0800)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Sat, 4 Mar 2017 01:39:18 +0000 (17:39 -0800)
author Linux Build Service Account <lnxbuild@localhost>
Sat, 4 Mar 2017 01:39:19 +0000 (17:39 -0800)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Sat, 4 Mar 2017 01:39:18 +0000 (17:39 -0800)
diff --cc drivers/usb/gadget/function/f_mtp.c
Simple merge
diff --cc kernel/sched/core.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Sat, 4 Mar 2017 01:39:19 +0000 (17:39 -0800)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Sat, 4 Mar 2017 01:39:18 +0000 (17:39 -0800)
		1	2
drivers/usb/gadget/function/f_mtp.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history