From: Greg Kroah-Hartman Date: Mon, 18 Sep 2017 09:00:16 +0000 (+0200) Subject: Merge branch 'staging_typec_move' into staging-next X-Git-Tag: v4.15-rc1~142^2~323 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dd7b01ad124b85620a9e1312697cb96cc5e21487;p=linux.git Merge branch 'staging_typec_move' into staging-next Move the typec code out of staging into the USB tree. This is on a separate branch so that we can share it with the USB git tree and not cause merge issues later on. Signed-off-by: Greg Kroah-Hartman --- dd7b01ad124b85620a9e1312697cb96cc5e21487