Skip to content
Commit f096ee80 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git 

# Conflicts:
#	drivers/extcon/extcon.c
parents c4023229 4e30418d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment