diff options
author | Mark Brown | 2015-08-30 15:56:27 +0100 |
---|---|---|
committer | Mark Brown | 2015-08-30 15:56:27 +0100 |
commit | a8f1d97bfa986f00835d2669a970e19f6dd9b9d8 (patch) | |
tree | 96f7bf7ff19e1232cd5ff5cd3e342c07f2f01262 /mm/memblock.c | |
parent | 532161e6ccbd1c5ac3a2ea9dc60c8e253cd22fa5 (diff) | |
parent | 5efe58c44312a7f8a1f3ec77c2b88f6d22b74880 (diff) | |
parent | 818454d1abcc127eef7e7d1cb169c69f53f7cd6d (diff) | |
parent | 469444fb134259384f3396833f6f1edde8bae203 (diff) | |
parent | 387ad57fe187b10fb4dec521e8d0ba5cefae7b35 (diff) |
Merge remote-tracking branches 'asoc/topic/rt298', 'asoc/topic/rt5640', 'asoc/topic/rt5651' and 'asoc/topic/rt5670' into asoc-next