OSDN Git Service

Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
authorDmitry Shmidt <dimitrysh@google.com>
Tue, 3 Jan 2017 19:23:35 +0000 (11:23 -0800)
committerDmitry Shmidt <dimitrysh@google.com>
Tue, 3 Jan 2017 19:23:35 +0000 (11:23 -0800)
commitaceae9be74c70f993ddd8d6a157f1a256591c43f
treed8ef291e4467dfd1d28e31e8a2f38049fdcece2c
parent9b133b6207826ae8cbe5f7de0b407253191e98fa
parent676b8efcce52d582153d3df3bc90689cab07a058
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y

Change-Id: I44dc2744898ca59ad15cd77b49ad84da0220250a
20 files changed:
include/net/ip6_route.h
include/net/sock.h
include/uapi/linux/rtnetlink.h
net/core/sock.c
net/ipv4/inet_connection_sock.c
net/ipv4/ping.c
net/ipv4/raw.c
net/ipv4/route.c
net/ipv4/tcp_ipv4.c
net/ipv4/udp.c
net/ipv6/datagram.c
net/ipv6/esp6.c
net/ipv6/ip6_gre.c
net/ipv6/ip6_tunnel.c
net/ipv6/ping.c
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/ipv6/udp.c
net/l2tp/l2tp_ip6.c
net/socket.c