Skip to content
Commit cb9850d0 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I
Browse files

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
parents 81522637 b78ea84a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment