summaryrefslogtreecommitdiffstats
path: root/net/sctp/socket.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-14 21:39:45 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-05-14 21:39:45 +0200
commiteac94da8b4cc3dd4336ed434fbc2370c3c850003 (patch)
treec8b9f912ce06c38d2e379006e511ef9d185de7eb /net/sctp/socket.c
parentMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff)
parentmac80211: fix on-channel remain-on-channel (diff)
downloadlinux-eac94da8b4cc3dd4336ed434fbc2370c3c850003.tar.xz
linux-eac94da8b4cc3dd4336ed434fbc2370c3c850003.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/sctp/socket.c')
0 files changed, 0 insertions, 0 deletions