projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 02388bf 7f4f7dd)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
authorDavid S. Miller <davem@davemloft.net>
Wed, 20 Sep 2017 23:08:23 +0000 (16:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Sep 2017 23:08:23 +0000 (16:08 -0700)
commit4c4d11b913ccef0eee8d32e5974ae26617676b77
tree683001bde3d4df6b9eaa463bf050d530d92ed511tree | snapshot
parent02388bf87f72e1d47174cd8f81c34443920eb5a0commit | diff
parent7f4f7dd4417d9efd038b14d39c70170db2e0baa0commit | diff
Merge git://git./pub/scm/linux/kernel/git/pablo/nf

Pablo Neira Ayuso says:

====================
Netfilter fixes for net

The following patchset contains two Netfilter fixes for your net tree,
they are:

1) Fix NAt compilation with UP, from Geert Uytterhoeven.

2) Fix incorrect number of entries when dumping a set, from
   Vishwanath Pai.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
John Crispins staging tree