Merge branch 'staging_typec_move' into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Sep 2017 09:00:16 +0000 (11:00 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 Sep 2017 09:00:16 +0000 (11:00 +0200)
commitdd7b01ad124b85620a9e1312697cb96cc5e21487
tree73cdc8a21863dc99f08e097146c0ba29987ffd1d
parent802d7d0bf22b663b96d2a37a3168c0d8c22a0056
parent76f0c53d08b933b4708be0d775ba57a0fb4d858a
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 <gregkh@linuxfoundation.org>