From: David S. Miller <davem@davemloft.net>
Date: Wed, 26 Mar 2014 00:29:20 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=04f58c88542b6b351efb4eea01134eb672e22e6e;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./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>
---

04f58c88542b6b351efb4eea01134eb672e22e6e
diff --cc Documentation/devicetree/bindings/net/micrel-ks8851.txt
index 8e20c04a1da1,4fc392763611..d54d0cc79487
--- a/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
+ 
+ Optional properties:
 -- local-mac-address : Ethernet mac address to use
+ - vdd-supply:	supply for Ethernet mac
diff --cc include/net/tcp.h
index bb253b9b2f06,743accec6c76..87d877408188
--- a/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,