Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86

author Chih-Wei Huang <cwhuang@linux.org.tw>

Mon, 5 Mar 2018 04:03:06 +0000 (12:03 +0800)

committer Chih-Wei Huang <cwhuang@linux.org.tw>

Mon, 5 Mar 2018 04:03:06 +0000 (12:03 +0800)
author Chih-Wei Huang <cwhuang@linux.org.tw>
Mon, 5 Mar 2018 04:03:06 +0000 (12:03 +0800)
committer Chih-Wei Huang <cwhuang@linux.org.tw>
Mon, 5 Mar 2018 04:03:06 +0000 (12:03 +0800)
diff --cc init.x86.rc
Simple merge
diff --cc packages.mk
Simple merge
author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Mon, 5 Mar 2018 04:03:06 +0000 (12:03 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Mon, 5 Mar 2018 04:03:06 +0000 (12:03 +0800)
		1	2
init.x86.rc	patch \|	diff1 \|	diff2 \|	blob \| history
packages.mk	patch \|	diff1 \|	diff2 \|	blob \| history