From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 11 Dec 2018 13:24:54 +0000 (+0100)
Subject: Merge tag 'extcon-next-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.0-rc1~95^2~17
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2701e804f00f79823f69f37c87fef171ac345484;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'extcon-next-for-4.21' of git://git./linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon for 4.21

Detailed description for this pull request:
1. Fix minor issue of Maxim MUIC (Micro USB IC) device driver
- Avoid forcing UART path on probe for extcon-max77843/77693/14577/8997.c
- Set USB path in USB device mode for extcon-max8997.c

* tag 'extcon-next-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
  extcon: max8997: Fix lack of path setting in USB device mode
  extcon: max8997: Avoid forcing UART path on drive probe
  extcon: max14577: Avoid forcing UART path on drive probe
  extcon: max77693: Avoid forcing UART path on drive probe
  extcon: max77843: Avoid forcing UART path on drive probe
---

2701e804f00f79823f69f37c87fef171ac345484