diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-06-24 18:44:59 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-24 18:44:59 (GMT) |
commit | 66ba271ab90424ba5a895662b6783c4837a96e0a (patch) | |
tree | 5ae7ebd942fe3f2246a52d18f35f67d3db4e4b5c /net/sctp | |
parent | 2b5e54e22f596bcd9ec0018f228a2606e016a108 (diff) | |
parent | 6c7c4cbfd5f59c04a40af67ad72d14e19215ef36 (diff) | |
download | linux-fsl-qoriq-66ba271ab90424ba5a895662b6783c4837a96e0a.tar.xz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/sctp')
0 files changed, 0 insertions, 0 deletions