Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	Documentation/devicetree/bindings/net/micrel-ks8851.txt
	net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

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

diff --cc Documentation/devicetree/bindings/net/micrel-ks8851.txt
index 8e20c04,4fc3927..d54d0cc
--- 1/Documentation/devicetree/bindings/net/micrel-ks8851.txt
--- 2/Documentation/devicetree/bindings/net/micrel-ks8851.txt
+++ b/Documentation/devicetree/bindings/net/micrel-ks8851.txt
@@@ -4,3 -4,7 +4,6 @@@ Required properties
  - compatible = "micrel,ks8851-ml" of parallel interface
  - reg : 2 physical address and size of registers for data and command
  - interrupts : interrupt connection
 -- local-mac-address : Ethernet mac address to use
+ 
+ Optional properties:
+ - vdd-supply: supply for Ethernet mac

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/atheros/alx/main.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

diff --cc drivers/net/ethernet/via/via-rhine.c
Simple merge

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/usb/cdc_ncm.c
Simple merge

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
Simple merge

diff --cc include/linux/usb/cdc_ncm.h
Simple merge

diff --cc include/net/tcp.h
index bb253b9,743acce..87d8774
--- 1/include/net/tcp.h
--- 2/include/net/tcp.h
+++ b/include/net/tcp.h
@@@ -479,8 -478,9 +479,8 @@@ int __cookie_v4_check(const struct iphd
  struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
                             struct ip_options *opt);
  #ifdef CONFIG_SYN_COOKIES
 -#include <linux/ktime.h>
  
- /* Syncookies use a monotonic timer which increments every 64 seconds.
+ /* Syncookies use a monotonic timer which increments every 60 seconds.
   * This counter is used both as a hash input and partially encoded into
   * the cookie value.  A cookie is only validated further if the delta
   * between the current counter value and the encoded one is less than this,

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/key/af_key.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge

diff --cc security/selinux/include/xfrm.h
Simple merge