projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitef8570d859a5872db525ec1464165352e4f2bdaa
tree272758d4f1324294ed0eb66b416aeb5faca2d342tree
parent11b57f90257c1d6a91cee720151b69e0c2020cf6commit | diff
parent74f77a6b2b1c98d3f14364dccdd2353b99ecfedacommit | diff
Merge branch 'master' of git://git./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 diff1 | diff2 | blob | history
net/netfilter/Makefile diff1 | diff2 | blob | history
MicroBlaze GIT Repository