]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Jan 2014 19:50:02 +0000 (14:50 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Jan 2014 19:50:02 +0000 (14:50 -0500)
commit5c91b73cd5f1500037c422d930e703eb9891012b
tree272758d4f1324294ed0eb66b416aeb5faca2d342
parentbcfe1d90bcf452a18aee27b9a1a4434e47258527
parent2ff921a6f006d9036976645e63b0c4696a6384ea
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>
net/netfilter/Kconfig
net/netfilter/Makefile