Merge branch 'next' into resolution
commitcb9850d092f7d2c86662d71fbfe10685cbddda21
authorKishon Vijay Abraham I <kishon@ti.com>
Thu, 15 Sep 2016 10:16:11 +0000 (15 15:46 +0530)
committerKishon Vijay Abraham I <kishon@ti.com>
Thu, 15 Sep 2016 11:15:20 +0000 (15 16:45 +0530)
tree77023cbc002680edbe3738f87dc9be413a8b8e68
parent81522637485dd6ec9de4279c9714d58f884b6091
parentb78ea84a7d45b9e5ad2eee429a2140065a39d755
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
drivers/extcon/extcon-gpio.c
include/linux/extcon.h