projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 73b4f63 4c1017a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Feb 2015 22:27:24 +0000 (14:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Feb 2015 22:27:24 +0000 (14:27 -0800)
commit4a3046d68a5a6b7a2474c9d65811091841675cdb
treebe6c0878a164e45bced7c4cfa534fe29f34110c5tree | snapshot (tar.gz zip)
parent73b4f63aebd6d57db4ca1d31fa6f8516651207b0commit | diff
parent4c1017aa80c95a74703139bb95c4ce0d130efe4dcommit | diff
Merge git://git./linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

The following patchset contains two small Netfilter updates for your
net-next tree, they are:

1) Add ebtables support to nft_compat, from Arturo Borrero.

2) Fix missing validation of the SET_ID attribute in the lookup
   expressions, from Patrick McHardy.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>