Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Conflicts:
	kernel/futex.c
	net/ipv6/route.c

diff --cc Documentation/networking/ip-sysctl.txt
Simple merge

diff --cc drivers/input/Kconfig
Simple merge

diff --cc include/linux/ipv6.h
Simple merge

diff --cc include/net/addrconf.h
Simple merge

diff --cc include/net/ip.h
Simple merge

diff --cc include/net/ipv6.h
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/sysctl_net_ipv4.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

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

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

diff --cc net/ipv6/route.c
index b2614b22622baa266ad801a065d9e88698fd9df6,8ecf44af7c2ef273be3f426cb652ad493e692f1d..18e27efa1bc31db0ea47eef6d109c971ede82a69
--- 1/net/ipv6/route.c
--- 2/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -727,11 -683,7 +725,10 @@@ int rt6_route_rcv(struct net_device *de
                prefix = &prefix_buf;
        }
  
 -      rt = rt6_get_route_info(dev, prefix, rinfo->prefix_len, gwaddr);
 +      if (rinfo->prefix_len == 0)
 +              rt = rt6_get_dflt_router(gwaddr, dev);
 +      else
-               rt = rt6_get_route_info(net, prefix, rinfo->prefix_len,
-                                       gwaddr, dev->ifindex);
++              rt = rt6_get_route_info(dev, prefix, rinfo->prefix_len, gwaddr);
  
        if (rt && !lifetime) {
                ip6_del_rt(rt);

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