Steps on the way to v7.0-rc1 Resolves trivial merge conflicts in: mm/cma.c Cc: Suren Baghdasaryan <surenb@google.com> Change-Id: Ifb7dc04f3ce279318b9c10525ef81b304201d7ae Signed-off-by: Carlos Llamas <cmllamas@google.com>
Steps on the way to v7.0-rc1 Resolves trivial merge conflicts in: mm/cma.c Cc: Suren Baghdasaryan <surenb@google.com> Change-Id: Ifb7dc04f3ce279318b9c10525ef81b304201d7ae Signed-off-by: Carlos Llamas <cmllamas@google.com>