diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-01-10 14:50:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-10 14:50:02 -0500 |
| commit | ef8570d859a5872db525ec1464165352e4f2bdaa (patch) | |
| tree | 272758d4f1324294ed0eb66b416aeb5faca2d342 /net/wireless/nl80211.c | |
| parent | xen-netback: stop vif thread spinning if frontend is unresponsive (diff) | |
| parent | netfilter: introduce l2tp match extension (diff) | |
| download | linux-dev-ef8570d859a5872db525ec1464165352e4f2bdaa.tar.xz linux-dev-ef8570d859a5872db525ec1464165352e4f2bdaa.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
This batch contains one single patch with the l2tp match
for xtables, from James Chapman.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/nl80211.c')
0 files changed, 0 insertions, 0 deletions