| commit | 82e3c83e23ff0d08de575e359b5eb5e50c7f894f | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Oct 19 22:43:31 2017 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Oct 19 22:43:31 2017 +0200 |
| tree | f7a20005bf3213a8793b5c9f2ecdabe7be5da9e2 | |
| parent | 06743cbfc5e11d6af3293e4f7e5468ab83f3e369 [diff] | |
| parent | 5627453efabf8eef84ce1dce6767d1268570a6c5 [diff] |
Merge tag 'davinci-for-v4.15/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc Pull "DaVinci defconfig updates for v4.15" from Sekhar Nori: Enable CMA and MTD command line partitioning support. * tag 'davinci-for-v4.15/defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci_all_defconfig: enable CMA options ARM: davinci_all_defconfig: enable MTD_CMDLINE_PARTS