| commit | d230ec72c4efed7d0f414a80a756c54d4c422a6e | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 6 Oct 2016 15:13:35 +0000 (6 08:13 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 6 Oct 2016 15:13:35 +0000 (6 08:13 -0700) | ||
| tree | d437aaad8dfb78dc6926a704b96f09fed6a874e8 | treesnapshot (tar.gz zip) |
| parent | f84d9fa86820b3074a8c143444a6932c0c0fd019 | commitdiff |
| parent | af70c1f92d3567035d2f73f39079459d58c706dc | commitdiff |
Merge git://git./linux/kernel/git/davem/net
Pull networking fixups from David Miller:
"Here are the build and merge fixups for the networking stuff"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
phy: micrel.c: Enable ksz9031 energy-detect power-down mode
netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
netfilter: nft_limit: fix divided by zero panic
netfilter: fix namespace handling in nf_log_proc_dostring
netfilter: xt_hashlimit: Fix link error in 32bit arch because of 64bit division
netfilter: accommodate different kconfig in nf_set_hooks_head
netfilter: Fix potential null pointer dereference
Pull networking fixups from David Miller:
"Here are the build and merge fixups for the networking stuff"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
phy: micrel.c: Enable ksz9031 energy-detect power-down mode
netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
netfilter: nft_limit: fix divided by zero panic
netfilter: fix namespace handling in nf_log_proc_dostring
netfilter: xt_hashlimit: Fix link error in 32bit arch because of 64bit division
netfilter: accommodate different kconfig in nf_set_hooks_head
netfilter: Fix potential null pointer dereference