Merge branch 'master' into upstream-merge-32116

2017-10-29 03:45:59 -04:00
parent 7ffe1b4e23 6156067cd6
commit 4b300cee6c
115 changed files with 2009 additions and 1736 deletions
@@ -67,3 +67,4 @@ GLOBAL_VAR_INIT(cmp_field, "name")

 /proc/cmp_profile_count_dsc(list/A, list/B)
 	return B[PROFILE_ITEM_COUNT] - A[PROFILE_ITEM_COUNT]
+