phy: for 4.9 (with extcon merge resolution)

This includes tags/phy-for-4.9 along with merge resolution
when linux-phy -next is merged with usb-next.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Merge branch 'next' into resolution

Conflicts:
	drivers/extcon/extcon-adc-jack.c
	drivers/extcon/extcon-arizona.c
	drivers/extcon/extcon-gpio.c
	include/linux/extcon.h