diff options
| author | David S. Miller <davem@davemloft.net> | 2017-09-20 16:08:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-20 16:08:23 -0700 |
| commit | 4c4d11b913ccef0eee8d32e5974ae26617676b77 (patch) | |
| tree | 683001bde3d4df6b9eaa463bf050d530d92ed511 /drivers/uwb/drp-avail.c | |
| parent | 02388bf87f72e1d47174cd8f81c34443920eb5a0 (diff) | |
| parent | 7f4f7dd4417d9efd038b14d39c70170db2e0baa0 (diff) | |
Merge git://git.kernel.org/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>
Diffstat (limited to 'drivers/uwb/drp-avail.c')
0 files changed, 0 insertions, 0 deletions