OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8c7314c
91ed81f
)
Merge branch 'gtp-sgsn-side-tunnel'
author
David S. Miller
<davem@davemloft.net>
Sun, 26 Mar 2017 03:11:19 +0000
(20:11 -0700)
committer
David S. Miller
<davem@davemloft.net>
Sun, 26 Mar 2017 03:11:19 +0000
(20:11 -0700)
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>
Trivial merge