summaryrefslogtreecommitdiffstats
path: root/drivers/net/hyperv
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-03-25 20:11:19 -0700
committerDavid S. Miller <davem@davemloft.net>2017-03-25 20:11:19 -0700
commit71ee0307f504764dd1d9fd9bd04213f210567600 (patch)
tree73165e856fe64a2bf64a20fc256b8161b3a66f3e /drivers/net/hyperv
parent8c7314c65a1e413de3fb409f28e3ba55429d6996 (diff)
parent91ed81f9abc76d5a61b07cb8286c680c9330b7a1 (diff)
Merge branch 'gtp-sgsn-side-tunnel'
Jonas Bonn says: ==================== GTP SGSN-side tunnel Changes since v4: * Respin the series on top of net-next; the conflicts were trivial, amounting to just code having been shifted about ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hyperv')
0 files changed, 0 insertions, 0 deletions