summaryrefslogtreecommitdiff
path: root/net/sctp/proc.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-06-14 15:31:22 -0700
committerDavid S. Miller <davem@davemloft.net>2013-06-14 15:31:22 -0700
commit09ce069dff607f86dcdeb541d20734a8f42478c5 (patch)
tree03c7e9dc78d4dbfc2b3687053bbbd1680789934d /net/sctp/proc.c
parent948e306d7d645af80ea331b60495710fe4fe12bb (diff)
parent93d8fd1514b6862c3370ea92be3f3b4216e0bf8f (diff)
downloadlinux-09ce069dff607f86dcdeb541d20734a8f42478c5.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says: ==================== A few miscellaneous improvements and cleanups before the GRE tunnel integration series. Intended for net-next/3.11. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/proc.c')
0 files changed, 0 insertions, 0 deletions