Merge tag 'v4.4.38' into android-4.4.y
authorDmitry Shmidt <dimitrysh@google.com>
Mon, 12 Dec 2016 18:13:41 +0000 (10:13 -0800)
committerDmitry Shmidt <dimitrysh@google.com>
Mon, 12 Dec 2016 18:13:41 +0000 (10:13 -0800)
This is the 4.4.38 stable release

1  2 
net/ipv4/ip_output.c
net/ipv4/ping.c
net/ipv6/esp6.c

Simple merge
diff --cc net/ipv4/ping.c
Simple merge
diff --cc net/ipv6/esp6.c
Simple merge