]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11b57f9 74f77a6)
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)
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>
1  2 
net/netfilter/Kconfig patch | diff1 | diff2 | blob | history
net/netfilter/Makefile patch | diff1 | diff2 | blob | history

diff --cc net/netfilter/Kconfig
Simple merge
diff --cc net/netfilter/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.