From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 19 Oct 2017 20:43:31 +0000 (+0200)
Subject: Merge tag 'davinci-for-v4.15/defconfig' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.15-rc1~76^2~25
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=82e3c83e23ff0d08de575e359b5eb5e50c7f894f;p=linux.git

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
---

82e3c83e23ff0d08de575e359b5eb5e50c7f894f