| commit | ef8570d859a5872db525ec1464165352e4f2bdaa | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Jan 10 14:50:02 2014 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Jan 10 14:50:02 2014 -0500 |
| tree | 272758d4f1324294ed0eb66b416aeb5faca2d342 | |
| parent | 11b57f90257c1d6a91cee720151b69e0c2020cf6 [diff] | |
| parent | 74f77a6b2b1c98d3f14364dccdd2353b99ecfeda [diff] |
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>