Kishon Vijay Abraham I cb9850d092 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

2016-09-15 16:45:20 +05:30

4.5 KiB

Raw Blame History

View Raw