Merge 4.4.184 into android-4.4

author Greg Kroah-Hartman <gregkh@google.com>

Fri, 28 Jun 2019 09:20:02 +0000 (11:20 +0200)

committer Greg Kroah-Hartman <gregkh@google.com>

Fri, 28 Jun 2019 09:20:02 +0000 (11:20 +0200)
author Greg Kroah-Hartman <gregkh@google.com>
Fri, 28 Jun 2019 09:20:02 +0000 (11:20 +0200)
committer Greg Kroah-Hartman <gregkh@google.com>
Fri, 28 Jun 2019 09:20:02 +0000 (11:20 +0200)
diff --cc Makefile
Simple merge
diff --cc net/ipv4/tcp_output.c
Simple merge
author	Greg Kroah-Hartman <gregkh@google.com>
	Fri, 28 Jun 2019 09:20:02 +0000 (11:20 +0200)
committer	Greg Kroah-Hartman <gregkh@google.com>
	Fri, 28 Jun 2019 09:20:02 +0000 (11:20 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	patch \|	diff1 \|	diff2 \|	blob \| history