Merge branch 'android-4.9' into amlogic-4.9-dev

author Victor Wan <victor.wan@amlogic.com>

Tue, 1 Aug 2017 10:38:14 +0000 (18:38 +0800)

committer Victor Wan <victor.wan@amlogic.com>

Tue, 1 Aug 2017 10:38:14 +0000 (18:38 +0800)
author Victor Wan <victor.wan@amlogic.com>
Tue, 1 Aug 2017 10:38:14 +0000 (18:38 +0800)
committer Victor Wan <victor.wan@amlogic.com>
Tue, 1 Aug 2017 10:38:14 +0000 (18:38 +0800)
diff --cc Makefile
Simple merge
diff --cc drivers/usb/core/quirks.c
Simple merge
diff --cc drivers/usb/core/usb.c
Simple merge
diff --cc include/linux/usb/hcd.h
Simple merge
author	Victor Wan <victor.wan@amlogic.com>
	Tue, 1 Aug 2017 10:38:14 +0000 (18:38 +0800)
committer	Victor Wan <victor.wan@amlogic.com>
	Tue, 1 Aug 2017 10:38:14 +0000 (18:38 +0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/usb.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/usb/hcd.h	patch \|	diff1 \|	diff2 \|	blob \| history