Merge remote-tracking branch 'chanwoo-extcon/ib-extcon-4.12' into psy-next
authorSebastian Reichel <sre@kernel.org>
Thu, 13 Apr 2017 23:41:45 +0000 (01:41 +0200)
committerSebastian Reichel <sre@kernel.org>
Thu, 13 Apr 2017 23:41:45 +0000 (01:41 +0200)

Trivial merge