From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Oct 2016 15:13:35 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.9-rc1~113
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d230ec72c4efed7d0f414a80a756c54d4c422a6e;p=karo-tx-linux.git

Merge git://git.kernel.org/pub/scm/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
---

d230ec72c4efed7d0f414a80a756c54d4c422a6e