tree 3b4f4ee7ed31a0372c225cb03dd3ea45a736dc46
parent 81522637485dd6ec9de4279c9714d58f884b6091
parent b78ea84a7d45b9e5ad2eee429a2140065a39d755
author Kishon Vijay Abraham I <kishon@ti.com> 1473934571 +0530
committer Kishon Vijay Abraham I <kishon@ti.com> 1474001323 +0530

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