]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 802d7d0 76f0c53)
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)
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>

Trivial merge
local clone of linux.git