tree 13cc7ec18b4b719e03e17ad4b24c09687fe3efa2
parent ee5b2a19dbbff4d691711467588c0646b39260e5
parent 6975529f4f8f1477f6e8d469f1260ff767511230
author Linux Build Service Account <lnxbuild@localhost> 1356001345 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> 1356001344 -0800

Merge "mm: Use correct define for CMA features"