Merge branch 'gtp-sgsn-side-tunnel'
authorDavid S. Miller <davem@davemloft.net>
Sun, 26 Mar 2017 03:11:19 +0000 (20:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 26 Mar 2017 03:11:19 +0000 (20:11 -0700)
commit71ee0307f504764dd1d9fd9bd04213f210567600
tree73165e856fe64a2bf64a20fc256b8161b3a66f3e
parent8c7314c65a1e413de3fb409f28e3ba55429d6996
parent91ed81f9abc76d5a61b07cb8286c680c9330b7a1
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>